chore(deps): Amplify Android 2.15.0 (#4279)

* chore(deps): Amplify Android 2.15.0 * chore: update Kotlin version --------- Co-authored-by: Nika Hassani <nikaws@amazon.com> Co-authored-by: Jordan Nelson <Jordanryannelson@gmail.com>
aws-amplify · Apr 17, 2024 · 8d862bb · 8d862bb
1 parent f470a6c
commit 8d862bb
Show file tree

Hide file tree

Showing 55 changed files with 1,257 additions and 1,119 deletions.
diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # 3.12.0
         with:
           distribution: "corretto" # Amazon Corretto Build of OpenJDK
-          java-version: "11"
+          java-version: "17"
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies

diff --git a/.github/workflows/flutter_android.yaml b/.github/workflows/flutter_android.yaml
@@ -31,6 +31,12 @@ jobs:
         exclude:
           - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
     steps:
+      - name: Setup Java
+        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # 3.12.0
+        with:
+          distribution: "corretto" # Amazon Corretto Build of OpenJDK
+          java-version: "17"
+
       - name: Git Checkout
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
 

diff --git a/canaries/android/app/build.gradle b/canaries/android/app/build.gradle
@@ -30,12 +30,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {

diff --git a/packages/amplify/amplify_flutter/example/android/app/build.gradle b/packages/amplify/amplify_flutter/example/android/app/build.gradle
diff --git a/packages/amplify_datastore/android/build.gradle b/packages/amplify_datastore/android/build.gradle
@@ -2,7 +2,7 @@ group 'com.amazonaws.amplify.amplify_datastore'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.10'
     repositories {
         mavenLocal()
         google()
@@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'org.jlleitschuh.gradle.ktlint'
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -54,11 +54,14 @@ android {
         htmlReport false
     }
     compileOptions {
-        // Support for Java 8 features
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -69,13 +72,10 @@ android {
 }
 
 dependencies {
-    // Support for Java 8 features
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
-
-    implementation 'com.amplifyframework:aws-auth-cognito:2.13.0'
-    implementation "com.amplifyframework:aws-api:2.13.0"
-    implementation "com.amplifyframework:aws-datastore:2.13.0"
-    implementation "com.amplifyframework:aws-api-appsync:2.13.0"
+    implementation 'com.amplifyframework:aws-auth-cognito:2.15.0'
+    implementation "com.amplifyframework:aws-api:2.15.0"
+    implementation "com.amplifyframework:aws-datastore:2.15.0"
+    implementation "com.amplifyframework:aws-api-appsync:2.15.0"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 
@@ -88,7 +88,7 @@ dependencies {
 
     // Tests must be updated if bumped
     //noinspection GradleDependency
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.12.1'
     testImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
     testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.4'
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'

diff --git a/packages/amplify_datastore/android/gradle/wrapper/gradle-wrapper.properties b/packages/amplify_datastore/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip