Skip to content

Commit 2aa2a97

Browse files
committed
#94: Target API 33
1 parent 6c7e6aa commit 2aa2a97

File tree

10 files changed

+306
-156
lines changed

10 files changed

+306
-156
lines changed

AndroidManifest.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,24 @@
1212
android:name="android.hardware.bluetooth_le"
1313
android:required="false"/>
1414

15-
<uses-permission android:name="android.permission.BLUETOOTH" />
16-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
17-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
15+
<uses-permission android:name="android.permission.BLUETOOTH"
16+
android:maxSdkVersion="30" />
17+
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
18+
android:maxSdkVersion="30" />
19+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
20+
android:maxSdkVersion="30" />
1821
<uses-permission android:name="android.permission.INTERNET" />
1922
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2023
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
2124
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
2225
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
2326
<uses-permission android:name="android.permission.WAKE_LOCK" />
2427

28+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"
29+
android:usesPermissionFlags="neverForLocation"/>
30+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
31+
32+
2533
<application
2634
android:allowBackup="true"
2735
android:icon="@drawable/ic_launcher"
@@ -31,7 +39,8 @@
3139
android:name="se.bitcraze.crazyfliecontrol2.MainActivity"
3240
android:label="@string/title_activity_main"
3341
android:launchMode="singleTop"
34-
android:screenOrientation="sensorLandscape" >
42+
android:screenOrientation="sensorLandscape"
43+
android:exported="true" >
3544
<intent-filter>
3645
<action android:name="android.intent.action.MAIN" />
3746

build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.4.3'
7+
classpath 'com.android.tools.build:gradle:8.1.1'
88
}
99
}
1010
allprojects {
@@ -17,11 +17,12 @@ apply plugin: 'com.android.application'
1717

1818
android {
1919

20-
compileSdkVersion 28
21-
buildToolsVersion '28.0.3'
20+
compileSdk 33
2221

2322
useLibrary 'org.apache.http.legacy'
2423

24+
namespace "se.bitcraze.crazyfliecontrol2"
25+
2526
buildTypes {
2627
debug {
2728
sourceSets {
@@ -61,12 +62,16 @@ android {
6162
}
6263
defaultConfig {
6364
minSdkVersion 14
64-
targetSdkVersion 28
65+
targetSdkVersion 33
66+
}
67+
buildFeatures {
68+
renderScript true
69+
aidl true
6570
}
6671
}
6772

6873
dependencies {
69-
implementation 'com.android.support:support-v4:28.0.0'
74+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
7075
implementation 'org.slf4j:slf4j-android:1.6.1-RC1'
7176
implementation 'com.fasterxml.jackson.core:jackson-core:2.6.3'
7277
implementation 'com.fasterxml.jackson.core:jackson-databind:2.6.3'

gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
android.defaults.buildfeatures.buildconfig=true
2+
android.enableJetifier=true
3+
android.nonFinalResIds=false
4+
android.nonTransitiveRClass=false
5+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

9.41 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sun May 26 01:41:36 CEST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 commit comments

Comments
 (0)