Skip to content

Commit abd96c4

Browse files
committed
Merge branch 'develop' into release/v0.0.12
2 parents 7956a80 + 894f434 commit abd96c4

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

BLE-MIDI-library/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
xmlns:tools="http://schemas.android.com/tools"
33
package="jp.kshoji.blemidi">
44

5-
<!-- specify minSdkVersion for lint tools -->
6-
<uses-sdk android:minSdkVersion="18" tools:ignore="GradleOverrides" />
7-
85
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
96
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
107

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
#android.useAndroidX=true
19+
android.useAndroidX=true
2020
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m

0 commit comments

Comments
 (0)