Skip to content
This repository was archived by the owner on Nov 11, 2025. It is now read-only.

Commit c921f89

Browse files
authored
chore: bump Java and Gradle version in Android sample (#34)
1 parent 853658b commit c921f89

10 files changed

Lines changed: 295 additions & 212 deletions

File tree

.github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-java@v3
1515
with:
1616
distribution: 'corretto'
17-
java-version: '17'
17+
java-version: '21'
1818
cache: gradle
1919
- name: Build android apk
2020
run: |

.github/workflows/build-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build-ios:
11-
runs-on: macos-13-xl
11+
runs-on: macos-latest
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Build ios

.github/workflows/build-rn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
./gradlew assembleDebug
3535
3636
build-ios:
37-
runs-on: macos-13-xl
37+
runs-on: macos-latest
3838
steps:
3939
- uses: actions/checkout@v3
4040
- name: Build ios

.github/workflows/build-web.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: '18.20.6'
1417
- name: Run build
1518
run: |
1619
cd web

android/app/build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ plugins {
33
id 'org.jetbrains.kotlin.android'
44
id 'kotlin-kapt'
55
id 'dagger.hilt.android.plugin'
6-
id 'com.google.devtools.ksp' version '1.8.10-1.0.9'
6+
id 'com.google.devtools.ksp' version '2.0.20-1.0.24'
77
id 'kotlin-parcelize'
8+
id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
89
}
910

1011
android {
12+
namespace "com.kanyideveloper.joomia"
1113
compileSdk 34
1214

1315
defaultConfig {
@@ -30,11 +32,12 @@ android {
3032
}
3133
}
3234
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
35+
coreLibraryDesugaringEnabled true
36+
sourceCompatibility JavaVersion.VERSION_21
37+
targetCompatibility JavaVersion.VERSION_21
3538
}
3639
kotlinOptions {
37-
jvmTarget = '1.8'
40+
jvmTarget = '21'
3841
apiVersion = "1.8"
3942
}
4043
buildFeatures {
@@ -87,10 +90,11 @@ dependencies {
8790
implementation "androidx.compose.material:material:$compose_version"
8891

8992
// Hilt for DI
90-
implementation "com.google.dagger:hilt-android:2.44"
91-
kapt "com.google.dagger:hilt-compiler:2.44"
93+
implementation "com.google.dagger:hilt-android:2.51.1"
94+
kapt "com.google.dagger:hilt-compiler:2.51.1"
9295
kapt 'androidx.hilt:hilt-compiler:1.1.0'
9396
implementation 'androidx.hilt:hilt-navigation-compose:1.2.0-alpha01'
97+
9498
// Navigation made easier
9599
implementation 'io.github.raamcosta.compose-destinations:core:1.5.9-beta'
96100
ksp 'io.github.raamcosta.compose-destinations:ksp:1.5.9-beta'
@@ -125,5 +129,7 @@ dependencies {
125129
implementation "androidx.room:room-runtime:$room_version"
126130
kapt "androidx.room:room-compiler:$room_version"
127131

132+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
133+
128134
implementation 'software.aws.solution:clickstream:0.13.0'
129135
}

android/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ buildscript {
44
}
55
dependencies {
66
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
7+
classpath "com.android.tools.build:gradle:8.7.0"
78
}
89

910
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
1011
plugins {
11-
id 'com.android.application' version '7.3.1' apply false
12-
id 'com.android.library' version '7.3.1' apply false
13-
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
12+
id 'com.android.application' version '8.7.0' apply false
13+
id 'com.android.library' version '8.7.0' apply false
14+
id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
1415
}
1516

1617
task clean(type: Delete) {
-15.3 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Fri Dec 22 14:48:01 CST 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)