Skip to content

Commit 2a45aa2

Browse files
authored
update apps to Android 17 (#2407)
1 parent 0da326e commit 2a45aa2

26 files changed

Lines changed: 58 additions & 104 deletions

File tree

apps/OboeTester/app/build.gradle

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

33
android {
4-
compileSdkVersion 36
4+
compileSdkVersion 37
55
defaultConfig {
66
applicationId = "com.mobileer.oboetester"
77
minSdkVersion 23
8-
targetSdkVersion 36
8+
targetSdkVersion 37
99
versionCode 121
1010
versionName "2.8.17"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

apps/OboeTester/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ android.useAndroidX=true
3737
android.enableJetifier=true
3838
android.nonTransitiveRClass=false
3939
android.nonFinalResIds=false
40+
android.sync.suppressAgpWarnings=EXTERNAL_NATIVE_BUILD_CONFIGURATION,UNSUPPORTED_PROJECT_OPTION_USE

apps/fxlab/app/build.gradle

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
plugins {
18-
id 'com.android.application'
19-
id 'org.jetbrains.kotlin.android'
20-
}
17+
apply plugin: 'com.android.application'
2118

2219
android {
23-
compileSdkVersion 36
20+
compileSdkVersion 37
2421

2522
defaultConfig {
2623
applicationId "com.mobileer.androidfxlab"
2724
minSdkVersion 21
28-
targetSdkVersion 36
25+
targetSdkVersion 37
2926
versionCode 1
3027
versionName "1.0"
3128
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,9 +40,6 @@ android {
4340
sourceCompatibility = JavaVersion.VERSION_18
4441
targetCompatibility = JavaVersion.VERSION_18
4542
}
46-
kotlinOptions {
47-
jvmTarget = "18"
48-
}
4943
externalNativeBuild {
5044
cmake {
5145
path "./CMakeLists.txt"

apps/fxlab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildscript {
2525
mavenCentral()
2626
}
2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:8.9.0'
28+
classpath 'com.android.tools.build:gradle:9.3.1'
2929
// NOTE: Do not place your application dependencies here; they belong
3030
// in the individual module build.gradle files
3131
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

apps/fxlab/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ android.useAndroidX=true
3535
android.enableJetifier=true
3636
# Kotlin code style for this project: "official" or "obsolete":
3737
kotlin.code.style=official
38-
android.defaults.buildfeatures.buildconfig=true
3938
android.nonTransitiveRClass=false
4039
android.nonFinalResIds=false
40+
android.sync.suppressAgpWarnings=EXTERNAL_NATIVE_BUILD_CONFIGURATION,UNSUPPORTED_PROJECT_OPTION_USE
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Mar 11 13:58:39 EDT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

samples/LiveEffect/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
32

43
android {
5-
compileSdkVersion 36
4+
compileSdkVersion 37
65
defaultConfig {
76
applicationId 'com.google.oboe.samples.liveeffect'
87
minSdkVersion 23
9-
targetSdkVersion 36
8+
targetSdkVersion 37
109
versionCode 1
1110
versionName '1.0'
1211
ndk {

samples/MegaDrone/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
32

43
android {
4+
compileSdkVersion 37
55
defaultConfig {
66
applicationId "com.google.oboe.samples.megadrone"
77
minSdkVersion 23
8-
targetSdkVersion 36
9-
compileSdkVersion 36
8+
targetSdkVersion 37
109
versionCode 1
1110
versionName "1.0"
1211
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -30,7 +29,7 @@ android {
3029
release {
3130
signingConfig signingConfigs.release
3231
minifyEnabled false
33-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
32+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3433
debuggable false
3534
}
3635
}

samples/OboeDJ/build.gradle

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
32
apply plugin: 'org.jetbrains.kotlin.plugin.compose'
43

54
android {
6-
compileSdkVersion 35
5+
compileSdkVersion 37
76
defaultConfig {
87
applicationId 'com.google.oboe.samples.oboedj'
98
minSdkVersion 23
10-
targetSdkVersion 36
11-
compileSdkVersion 36
9+
targetSdkVersion 37
1210
versionCode 1
1311
versionName '1.0'
1412
externalNativeBuild {
@@ -22,17 +20,14 @@ android {
2220
buildTypes {
2321
release {
2422
minifyEnabled false
25-
proguardFiles getDefaultProguardFile('proguard-android.txt'),
23+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
2624
'proguard-rules.pro'
2725
}
2826
}
2927
compileOptions {
3028
sourceCompatibility JavaVersion.VERSION_18
3129
targetCompatibility JavaVersion.VERSION_18
3230
}
33-
kotlinOptions {
34-
jvmTarget = "18"
35-
}
3631
externalNativeBuild {
3732
cmake {
3833
path 'src/main/cpp/CMakeLists.txt'
@@ -41,9 +36,6 @@ android {
4136
buildFeatures {
4237
compose true
4338
}
44-
composeOptions {
45-
kotlinCompilerExtensionVersion compose_version
46-
}
4739
namespace 'com.google.oboe.samples.oboedj'
4840
}
4941

samples/RhythmGame/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
32

43
android {
4+
compileSdkVersion 37
55
defaultConfig {
66
applicationId "com.google.oboe.samples.rhythmgame"
77
minSdkVersion 23
8-
targetSdkVersion 36
9-
compileSdkVersion 36
8+
targetSdkVersion 37
109
versionCode 1
1110
versionName "1.0"
1211
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -20,7 +19,7 @@ android {
2019
buildTypes {
2120
release {
2221
minifyEnabled false
23-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
22+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2423
}
2524
}
2625
compileOptions {

0 commit comments

Comments
 (0)