Skip to content

Commit 4872ef8

Browse files
madebymozartmadebymozart
authored
Update All Sample Apps Deps (#2176)
1 parent d152b1b commit 4872ef8

File tree

19 files changed

+142
-111
lines changed

19 files changed

+142
-111
lines changed

‎.github/workflows/build-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
23-
java-version: 17
23+
java-version: 18
2424
- name: build samples and apps
2525
uses: github/codeql-action/init@v3
2626
with:

‎apps/fxlab/app/build.gradle

+19-15
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ apply plugin: 'kotlin-android'
2121
apply plugin: 'kotlin-kapt'
2222

2323
android {
24-
compileSdkVersion 34
25-
compileOptions {
26-
sourceCompatibility JavaVersion.VERSION_17
27-
targetCompatibility JavaVersion.VERSION_17
28-
}
24+
compileSdkVersion 35
25+
2926
defaultConfig {
3027
applicationId "com.mobileer.androidfxlab"
3128
minSdkVersion 21
32-
targetSdkVersion 34
29+
targetSdkVersion 35
3330
versionCode 1
3431
versionName "1.0"
3532
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,6 +37,13 @@ android {
4037
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
4138
}
4239
}
40+
compileOptions {
41+
sourceCompatibility = JavaVersion.VERSION_18
42+
targetCompatibility = JavaVersion.VERSION_18
43+
}
44+
kotlinOptions {
45+
jvmTarget = "18"
46+
}
4347
externalNativeBuild {
4448
cmake {
4549
path "./CMakeLists.txt"
@@ -53,13 +57,13 @@ android {
5357

5458
dependencies {
5559
implementation fileTree(dir: 'libs', include: ['*.jar'])
56-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
57-
implementation 'androidx.appcompat:appcompat:1.1.0'
58-
implementation 'androidx.core:core-ktx:1.1.0'
59-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
60-
implementation 'androidx.recyclerview:recyclerview:1.0.0'
61-
implementation 'com.google.android.material:material:1.2.0-alpha01'
62-
testImplementation 'junit:junit:4.12'
63-
androidTestImplementation 'androidx.test:runner:1.2.0'
64-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
60+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
61+
implementation 'androidx.appcompat:appcompat:1.7.0'
62+
implementation 'androidx.core:core-ktx:1.15.0'
63+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
64+
implementation 'androidx.recyclerview:recyclerview:1.4.0'
65+
implementation 'com.google.android.material:material:1.12.0'
66+
testImplementation 'junit:junit:4.13.2'
67+
androidTestImplementation 'androidx.test:runner:1.6.2'
68+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
6569
}

‎apps/fxlab/build.gradle

+10-9
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818

1919
buildscript {
20-
ext.kotlin_version = '1.9.0'
20+
ext {
21+
kotlin_version = '2.1.10'
22+
}
2123
repositories {
2224
google()
23-
jcenter()
24-
25+
mavenCentral()
2526
}
2627
dependencies {
27-
classpath 'com.android.tools.build:gradle:8.5.1'
28-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
28+
classpath 'com.android.tools.build:gradle:8.9.0'
2929
// NOTE: Do not place your application dependencies here; they belong
3030
// in the individual module build.gradle files
31+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
32+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
3133
}
3234
}
3335

3436
allprojects {
3537
repositories {
3638
google()
37-
jcenter()
38-
39+
mavenCentral()
3940
}
4041
}
4142

42-
task clean(type: Delete) {
43-
delete rootProject.buildDir
43+
tasks.register('clean', Delete) {
44+
delete rootProject.layout.buildDirectory
4445
}

‎apps/fxlab/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jun 25 14:12:01 PDT 2019
1+
#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
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

‎samples/LiveEffect/build.gradle

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
23

34
android {
4-
compileSdkVersion 34
5-
5+
compileSdkVersion 35
66
defaultConfig {
77
applicationId 'com.google.oboe.samples.liveeffect'
88
minSdkVersion 21
9-
targetSdkVersion 34
9+
targetSdkVersion 35
1010
versionCode 1
1111
versionName '1.0'
1212
ndk {
@@ -24,6 +24,10 @@ android {
2424
minifyEnabled false
2525
}
2626
}
27+
compileOptions {
28+
sourceCompatibility JavaVersion.VERSION_18
29+
targetCompatibility JavaVersion.VERSION_18
30+
}
2731
externalNativeBuild {
2832
cmake {
2933
path 'src/main/cpp/CMakeLists.txt'
@@ -33,7 +37,7 @@ android {
3337
}
3438

3539
dependencies {
36-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
37-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
40+
implementation 'androidx.appcompat:appcompat:1.7.0'
41+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
3842
implementation project(':audio-device')
3943
}

‎samples/MegaDrone/build.gradle

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
23

34
android {
4-
compileSdkVersion 34
55
defaultConfig {
66
applicationId "com.google.oboe.samples.megadrone"
77
minSdkVersion 21
8-
targetSdkVersion 34
8+
targetSdkVersion 35
9+
compileSdkVersion 35
910
versionCode 1
1011
versionName "1.0"
1112
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -33,6 +34,10 @@ android {
3334
debuggable false
3435
}
3536
}
37+
compileOptions {
38+
sourceCompatibility JavaVersion.VERSION_18
39+
targetCompatibility JavaVersion.VERSION_18
40+
}
3641
externalNativeBuild {
3742
cmake {
3843
path "src/main/cpp/CMakeLists.txt"
@@ -43,6 +48,6 @@ android {
4348

4449
dependencies {
4550
implementation fileTree(dir: 'libs', include: ['*.jar'])
46-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
47-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
51+
implementation 'androidx.appcompat:appcompat:1.7.0'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
4853
}

‎samples/RhythmGame/build.gradle

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
23

34
android {
4-
compileSdkVersion 34
55
defaultConfig {
66
applicationId "com.google.oboe.samples.rhythmgame"
7-
targetSdkVersion 34
7+
targetSdkVersion 35
8+
compileSdkVersion 35
89
versionCode 1
910
versionName "1.0"
1011
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -21,6 +22,10 @@ android {
2122
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2223
}
2324
}
25+
compileOptions {
26+
sourceCompatibility JavaVersion.VERSION_18
27+
targetCompatibility JavaVersion.VERSION_18
28+
}
2429
externalNativeBuild {
2530
cmake {
2631
path "CMakeLists.txt"
@@ -46,7 +51,7 @@ android {
4651
* - Uncomment this block
4752
* - Change the build variant to ffmpegExtractor
4853
* - Update the FFMPEG_DIR variable in CMakeLists.txt to the local FFmpeg path
49-
*/
54+
*/
5055
/*
5156
ffmpegExtractor {
5257
dimension "extractorLibrary"
@@ -60,10 +65,13 @@ android {
6065
*/
6166
}
6267
namespace 'com.google.oboe.samples.rhythmgame'
68+
buildFeatures {
69+
buildConfig true
70+
}
6371
}
6472

6573
dependencies {
6674
implementation fileTree(dir: 'libs', include: ['*.jar'])
67-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
68-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
75+
implementation 'androidx.appcompat:appcompat:1.7.0'
76+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
6977
}

‎samples/SoundBoard/build.gradle

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
plugins {
2-
id 'com.android.application'
3-
id 'org.jetbrains.kotlin.android'
4-
}
1+
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
53

64
android {
7-
compileSdkVersion 34
85
defaultConfig {
96
applicationId "com.google.oboe.samples.soundboard"
107
minSdkVersion 21
11-
targetSdkVersion 34
8+
targetSdkVersion 35
9+
compileSdkVersion 35
1210
versionCode 1
1311
versionName "1.0"
1412
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -39,6 +37,13 @@ android {
3937
debuggable true
4038
}
4139
}
40+
compileOptions {
41+
sourceCompatibility JavaVersion.VERSION_18
42+
targetCompatibility JavaVersion.VERSION_18
43+
}
44+
kotlinOptions {
45+
jvmTarget = '18'
46+
}
4247
externalNativeBuild {
4348
cmake {
4449
path "src/main/cpp/CMakeLists.txt"
@@ -49,6 +54,6 @@ android {
4954

5055
dependencies {
5156
implementation fileTree(dir: 'libs', include: ['*.jar'])
52-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
53-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
57+
implementation 'androidx.appcompat:appcompat:1.7.0'
58+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
5459
}

‎samples/audio-device/build.gradle

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 34
54
defaultConfig {
65
minSdkVersion 21
7-
targetSdkVersion 34
6+
targetSdkVersion 35
7+
compileSdkVersion 35
88
}
99
buildTypes {
1010
release {
1111
minifyEnabled false
1212
proguardFiles getDefaultProguardFile('proguard-android.txt')
1313
}
1414
}
15+
compileOptions {
16+
sourceCompatibility JavaVersion.VERSION_18
17+
targetCompatibility JavaVersion.VERSION_18
18+
}
1519
namespace 'com.google.oboe.samples.audio_device'
1620
}
1721

1822
dependencies {
19-
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
23+
implementation 'androidx.appcompat:appcompat:1.7.0'
2024
}

‎samples/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,22 @@
1919

2020
buildscript {
2121
ext {
22-
compose_version = '1.2.0'
23-
kotlin_version = '1.7.0'
22+
compose_version = '1.7.8'
23+
core_version = "1.15.0"
24+
lifecycle_version = "2.8.7"
25+
kotlin_version = '2.1.10'
2426
}
2527

2628
repositories {
2729
google()
2830
mavenCentral()
2931
}
3032
dependencies {
31-
classpath 'com.android.tools.build:gradle:8.5.1'
33+
classpath 'com.android.tools.build:gradle:8.9.0'
3234
// NOTE: Do not place your application dependencies here; they belong
3335
// in the individual module build.gradle files.
3436
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
37+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
3538
}
3639
}
3740

‎samples/drumthumper/build.gradle

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
id 'org.jetbrains.kotlin.android'
44
}
55
android {
6-
compileSdkVersion 34
7-
86
defaultConfig {
97
// Usually the applicationId follows the same scheme as the application package name,
108
// however, this sample will be published on the Google Play Store which will not allow an
@@ -13,33 +11,39 @@ android {
1311
// who publishes using the application Id prefix of "com.plausiblesoftware".
1412
applicationId "com.plausiblesoftware.drumthumper"
1513
minSdkVersion 23
16-
targetSdkVersion 34
14+
compileSdkVersion 35
15+
targetSdkVersion 35
1716
versionCode 2
1817
versionName "1.01"
1918

2019
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2120
}
22-
2321
buildTypes {
2422
release {
2523
minifyEnabled false
2624
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
2725
}
2826
}
29-
27+
compileOptions {
28+
sourceCompatibility JavaVersion.VERSION_18
29+
targetCompatibility JavaVersion.VERSION_18
30+
}
31+
kotlinOptions {
32+
jvmTarget = '18'
33+
}
3034
externalNativeBuild {
3135
cmake {
3236
path 'src/main/cpp/CMakeLists.txt'
3337
}
3438
}
39+
3540
namespace 'com.plausiblesoftware.drumthumper'
3641
}
3742

3843
dependencies {
3944
implementation fileTree(dir: 'libs', include: ['*.jar'])
40-
implementation "androidx.core:core-ktx:$kotlin_version"
41-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
42-
def lifecycle_version = "2.5.1"
45+
implementation "androidx.core:core-ktx:$core_version"
46+
implementation 'androidx.appcompat:appcompat:1.7.0'
4347
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
4448
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
4549
implementation project(path: ':iolib')

‎samples/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
# This option should only be used with decoupled projects. More details, visit
3434
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
3535
# org.gradle.parallel=true
36-
android.defaults.buildfeatures.buildconfig=true
3736
android.enableJetifier=true
3837
android.nonFinalResIds=false
3938
android.nonTransitiveRClass=false
4039
android.useAndroidX=true
40+
org.gradle.configuration-cache=true

0 commit comments

Comments
 (0)