chore: bump Java and Gradle version in Android sample (#34)

aws-samples · Feb 14, 2025 · c921f89 · c921f89
1 parent 853658b
commit c921f89
Show file tree

Hide file tree

Showing 10 changed files with 295 additions and 212 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
           cache: gradle
       - name: Build android apk
         run: |

diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-ios:
-    runs-on: macos-13-xl
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - name: Build ios

diff --git a/.github/workflows/build-rn.yml b/.github/workflows/build-rn.yml
@@ -34,7 +34,7 @@ jobs:
           ./gradlew assembleDebug
 
   build-ios:
-    runs-on: macos-13-xl
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - name: Build ios

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18.20.6'
       - name: Run build
         run: |
           cd web

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -3,11 +3,13 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
-    id 'com.google.devtools.ksp' version '1.8.10-1.0.9'
+    id 'com.google.devtools.ksp' version '2.0.20-1.0.24'
     id 'kotlin-parcelize'
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
 }
 
 android {
+    namespace "com.kanyideveloper.joomia"
     compileSdk 34
 
     defaultConfig {
@@ -30,11 +32,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '21'
         apiVersion = "1.8"
     }
     buildFeatures {
@@ -87,10 +90,11 @@ dependencies {
     implementation "androidx.compose.material:material:$compose_version"
 
     // Hilt for DI
-    implementation "com.google.dagger:hilt-android:2.44"
-    kapt "com.google.dagger:hilt-compiler:2.44"
+    implementation "com.google.dagger:hilt-android:2.51.1"
+    kapt "com.google.dagger:hilt-compiler:2.51.1"
     kapt 'androidx.hilt:hilt-compiler:1.1.0'
     implementation 'androidx.hilt:hilt-navigation-compose:1.2.0-alpha01'
+
     // Navigation made easier
     implementation 'io.github.raamcosta.compose-destinations:core:1.5.9-beta'
     ksp 'io.github.raamcosta.compose-destinations:ksp:1.5.9-beta'
@@ -125,5 +129,7 @@ dependencies {
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
+
     implementation 'software.aws.solution:clickstream:0.13.0'
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,13 +4,14 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
+        classpath "com.android.tools.build:gradle:8.7.0"
     }
 
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'com.android.application' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
 }
 
 task clean(type: Delete) {

diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Dec 22 14:48:01 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists