Skip to content

Commit 4e3ab86

Browse files
authored
Merge pull request #5 from martinwork/from288
From288
2 parents 7baaa07 + a406596 commit 4e3ab86

File tree

4 files changed

+641
-277
lines changed

4 files changed

+641
-277
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,11 @@ lint/tmp/
8787
# Android Profiling
8888
*.hprof
8989

90+
# OS-specific files
91+
.DS_Store
92+
.DS_Store?
93+
._*
94+
.Spotlight-V100
95+
.Trashes
96+
ehthumbs.db
97+
Thumbs.db

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdk 34
55

66
defaultConfig {
77
minSdkVersion 19
8-
targetSdkVersion 29
8+
targetSdk 33
99
}
1010

1111
buildTypes {
@@ -14,6 +14,10 @@ android {
1414
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
1515
}
1616
}
17+
namespace 'org.microbit.partialflashing'
18+
lint {
19+
abortOnError false
20+
}
1721
}
1822

1923
dependencies {

src/main/AndroidManifest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="org.microbit.partialflashing"
32
android:versionCode="1"
43
android:versionName="1.1" >
54

6-
<uses-permission android:name="android.permission.BLUETOOTH" />
7-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
5+
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
6+
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
7+
8+
<!-- API 31 Needed only if your app communicates with already-paired Bluetooth devices. -->
9+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
810
</manifest>

0 commit comments

Comments
 (0)