From f8ddee31b3cdcca996a43a43c5b66a1f20e0ea5a Mon Sep 17 00:00:00 2001 From: tjroach Date: Wed, 12 Nov 2025 16:15:25 -0500 Subject: [PATCH 1/2] Update Amplify Android versions and its dependencies --- src/components/MDXComponents/MDXCode.tsx | 4 ++++ src/constants/versions.ts | 11 ++++++----- .../android/getting-started/20_installLib.mdx | 10 ++++------ .../flutter/getting-started/20_installLib.mdx | 4 ++-- .../lib/graphqlapi/android/getting-started.mdx | 10 ++++------ .../logging/common/setup_logging/setup_logging.mdx | 6 ++---- .../android/create-application/20_gradle.mdx | 10 ++++------ .../project-setup/flutter/platform-setup/android.mdx | 4 ++-- src/fragments/start/getting-started/android/setup.mdx | 10 ++++------ .../analytics/set-up-analytics/index.mdx | 6 ++---- .../add-aws-services/geo/set-up-geo/index.mdx | 6 ++---- .../add-aws-services/logging/set-up-logging/index.mdx | 6 ++---- .../build-a-backend/auth/set-up-auth/index.mdx | 6 ++---- .../build-a-backend/data/set-up-data/index.mdx | 6 ++---- .../build-a-backend/storage/set-up-storage/index.mdx | 6 ++---- src/pages/[platform]/start/platform-setup/index.mdx | 4 ++-- src/pages/[platform]/start/quickstart/index.mdx | 8 +++----- 17 files changed, 49 insertions(+), 68 deletions(-) diff --git a/src/components/MDXComponents/MDXCode.tsx b/src/components/MDXComponents/MDXCode.tsx index 9622166332b..6e95ac18bd2 100644 --- a/src/components/MDXComponents/MDXCode.tsx +++ b/src/components/MDXComponents/MDXCode.tsx @@ -35,6 +35,10 @@ const addVersions = (code: string) => { /ANDROID_APPSYNC_SDK_VERSION/g, versions.ANDROID_APPSYNC_SDK_VERSION ); + code = code.replace( + /ANDROID_DESUGAR_VERSION/g, + versions.ANDROID_DESUGAR_VERSION + ); return code; }; diff --git a/src/constants/versions.ts b/src/constants/versions.ts index 6d4685b7456..c43cbe544dc 100644 --- a/src/constants/versions.ts +++ b/src/constants/versions.ts @@ -1,11 +1,12 @@ export const versions = { - ANDROID_VERSION: '2.24.0', + ANDROID_VERSION: '2.30.3', ANDROID_DEVPREVIEW: '1.36.5-dev-preview.0', ANDROID_V1_VERSION: '1.38.8', ANDROID_V1_GEO_VERSION: '1.0.1', ANDROID_V1_KOTLIN_VERSION: '0.22.8', - ANDROID_SDK_VERSION: '2.76.0', - KOTLIN_SDK_VERSION: '1.3.31', - ANDROID_AUTHENTICATOR_VERSION: '1.4.0', - ANDROID_APPSYNC_SDK_VERSION: '1.0.0' + ANDROID_SDK_VERSION: '2.81.0', + KOTLIN_SDK_VERSION: '1.5.15', + ANDROID_AUTHENTICATOR_VERSION: '1.7.0', + ANDROID_APPSYNC_SDK_VERSION: '1.0.1', + ANDROID_DESUGAR_VERSION: '2.1.5' }; diff --git a/src/fragments/lib/datastore/android/getting-started/20_installLib.mdx b/src/fragments/lib/datastore/android/getting-started/20_installLib.mdx index 18ef26fb9b4..5f2d45f42eb 100644 --- a/src/fragments/lib/datastore/android/getting-started/20_installLib.mdx +++ b/src/fragments/lib/datastore/android/getting-started/20_installLib.mdx @@ -6,20 +6,18 @@ Add the following dependencies to your **build.gradle (Module :app)** file and c dependencies { implementation 'com.amplifyframework:aws-datastore:ANDROID_VERSION' - // Support for Java 8 features - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + // Support for modern Java features + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' } ``` -At the top of the same file, add `compileOptions` to support the Java 8 features used by Amplify: +At the top of the same file, add `compileOptions` to support the modern Java features used by Amplify: ```groovy android { compileOptions { - // Support for Java 8 features + // Support for modern Java features coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } } ``` diff --git a/src/fragments/lib/datastore/flutter/getting-started/20_installLib.mdx b/src/fragments/lib/datastore/flutter/getting-started/20_installLib.mdx index b53f79c052d..b0caf82762b 100644 --- a/src/fragments/lib/datastore/flutter/getting-started/20_installLib.mdx +++ b/src/fragments/lib/datastore/flutter/getting-started/20_installLib.mdx @@ -30,7 +30,7 @@ compileOptions { ```diff title="android/app/build.gradle.kts" dependencies { -+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") ++ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10") } ``` @@ -53,7 +53,7 @@ Add the following dependency in `dependencies`. ```groovy dependencies { // add this line to support Java8 features - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/src/fragments/lib/graphqlapi/android/getting-started.mdx b/src/fragments/lib/graphqlapi/android/getting-started.mdx index 23c07cd761c..45be91681da 100644 --- a/src/fragments/lib/graphqlapi/android/getting-started.mdx +++ b/src/fragments/lib/graphqlapi/android/getting-started.mdx @@ -105,20 +105,18 @@ Next, add the following dependencies to your **app** `build.gradle`: dependencies { implementation 'com.amplifyframework:aws-api:ANDROID_VERSION' - // Support for Java 8 features - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + // Support for modern Java features + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' } ``` -Also in your **app** `build.gradle`, add this piece of code to support the Java 8 features Amplify uses: +Also in your **app** `build.gradle`, add this piece of code to support the modern Java features Amplify uses: ```groovy android { compileOptions { - // Support for Java 8 features + // Support for modern Java features coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } } ``` diff --git a/src/fragments/lib/logging/common/setup_logging/setup_logging.mdx b/src/fragments/lib/logging/common/setup_logging/setup_logging.mdx index 8309d7cdb0e..a56bf7f6f0e 100644 --- a/src/fragments/lib/logging/common/setup_logging/setup_logging.mdx +++ b/src/fragments/lib/logging/common/setup_logging/setup_logging.mdx @@ -82,10 +82,8 @@ Add the following dependencies to your `build.gradle (Module :app)` file and cli ``` android { compileOptions { - // Support for Java 8 features + // Support for modern Java features coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } } @@ -94,7 +92,7 @@ dependencies { implementation 'com.amplifyframework:aws-auth-cognito:ANDROID_VERSION' implementation 'com.amplifyframework:aws-logging-cloudwatch:ANDROID_VERSION' // ... other dependencies - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' } ``` diff --git a/src/fragments/lib/project-setup/android/create-application/20_gradle.mdx b/src/fragments/lib/project-setup/android/create-application/20_gradle.mdx index f7b85fd6fc9..11630bbd921 100644 --- a/src/fragments/lib/project-setup/android/create-application/20_gradle.mdx +++ b/src/fragments/lib/project-setup/android/create-application/20_gradle.mdx @@ -7,10 +7,8 @@ Add the following lines: ```groovy android { compileOptions { - // Support for Java 8 features + // Support for modern Java features coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } } @@ -18,12 +16,12 @@ dependencies { // Amplify core dependency implementation 'com.amplifyframework:core:ANDROID_VERSION' - // Support for Java 8 features - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + // Support for modern Java features + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' } ``` -- Set `coreLibraryDesugaringEnabled`, `sourceCompatibility`, and `targetCompatibility` to allow your application to make use of Java 8 features like Lambda expressions +- Set `coreLibraryDesugaringEnabled` to allow your application to make use of modern Java features like Lambda expressions - Add Amplify Core and Desugaring libraries to the `dependencies` block Run **Gradle Sync** diff --git a/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx b/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx index 7384389ef5f..f9d9b200509 100644 --- a/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx +++ b/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx @@ -102,8 +102,8 @@ android { compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { -- sourceCompatibility = JavaVersion.VERSION_1_8 -- targetCompatibility = JavaVersion.VERSION_1_8 +- sourceCompatibility = JavaVersion.VERSION_11 +- targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } diff --git a/src/fragments/start/getting-started/android/setup.mdx b/src/fragments/start/getting-started/android/setup.mdx index 7ee1a7d3933..db20646ce49 100644 --- a/src/fragments/start/getting-started/android/setup.mdx +++ b/src/fragments/start/getting-started/android/setup.mdx @@ -89,10 +89,8 @@ Add the following lines: ```groovy android { compileOptions { - // Support for Java 8 features + // Support for modern Java features coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } } @@ -101,12 +99,12 @@ dependencies { implementation 'com.amplifyframework:aws-api:ANDROID_VERSION' implementation 'com.amplifyframework:aws-datastore:ANDROID_VERSION' - // Support for Java 8 features - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + // Support for modern Java features + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION' } ``` -- Set `coreLibraryDesugaringEnabled`, `sourceCompatibility`, and `targetCompatibility` to allow your application to make use of Java 8 features like Lambda expressions +- Set `coreLibraryDesugaringEnabled` to allow your application to make use of modern Java features like Lambda expressions - Add Amplify API, Datastore, and Desugaring libraries to the `dependencies` block 4. Run **Gradle Sync** diff --git a/src/pages/[platform]/build-a-backend/add-aws-services/analytics/set-up-analytics/index.mdx b/src/pages/[platform]/build-a-backend/add-aws-services/analytics/set-up-analytics/index.mdx index 042913167c4..69c17289b64 100644 --- a/src/pages/[platform]/build-a-backend/add-aws-services/analytics/set-up-analytics/index.mdx +++ b/src/pages/[platform]/build-a-backend/add-aws-services/analytics/set-up-analytics/index.mdx @@ -143,10 +143,8 @@ Add Analytics by adding these libraries into the dependencies block: ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -157,7 +155,7 @@ dependencies { implementation("com.amplifyframework:aws-auth-cognito:ANDROID_VERSION") // highlight-end // ... other dependencies - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/build-a-backend/add-aws-services/geo/set-up-geo/index.mdx b/src/pages/[platform]/build-a-backend/add-aws-services/geo/set-up-geo/index.mdx index 69846f5b435..9ae56a41c27 100644 --- a/src/pages/[platform]/build-a-backend/add-aws-services/geo/set-up-geo/index.mdx +++ b/src/pages/[platform]/build-a-backend/add-aws-services/geo/set-up-geo/index.mdx @@ -179,10 +179,8 @@ Add the following dependencies to your **build.gradle.kts (Module :app)** file a ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -193,7 +191,7 @@ dependencies { implementation("com.amplifyframework:aws-geo-location:ANDROID_VERSION") // highlight-end // ... other dependencies - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/build-a-backend/add-aws-services/logging/set-up-logging/index.mdx b/src/pages/[platform]/build-a-backend/add-aws-services/logging/set-up-logging/index.mdx index 1a980604b32..f45bf27e07e 100644 --- a/src/pages/[platform]/build-a-backend/add-aws-services/logging/set-up-logging/index.mdx +++ b/src/pages/[platform]/build-a-backend/add-aws-services/logging/set-up-logging/index.mdx @@ -43,10 +43,8 @@ Add these libraries into the `dependencies` block: ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -57,7 +55,7 @@ dependencies { implementation("com.amplifyframework:aws-logging-cloudwatch:ANDROID_VERSION") // highlight-end // ... other dependencies - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/build-a-backend/auth/set-up-auth/index.mdx b/src/pages/[platform]/build-a-backend/auth/set-up-auth/index.mdx index 0b14f810977..9b557f33da5 100644 --- a/src/pages/[platform]/build-a-backend/auth/set-up-auth/index.mdx +++ b/src/pages/[platform]/build-a-backend/auth/set-up-auth/index.mdx @@ -449,10 +449,8 @@ The Authenticator component is built using [Jetpack Compose](https://developer.a ```kotlin title="app/build.gradle.kts" showLineNumbers={false} compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } buildFeatures { compose = true @@ -461,7 +459,7 @@ composeOptions { kotlinCompilerExtensionVersion = "1.2.0" } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/build-a-backend/data/set-up-data/index.mdx b/src/pages/[platform]/build-a-backend/data/set-up-data/index.mdx index 01125c78b9e..fdae75bba8a 100644 --- a/src/pages/[platform]/build-a-backend/data/set-up-data/index.mdx +++ b/src/pages/[platform]/build-a-backend/data/set-up-data/index.mdx @@ -163,10 +163,8 @@ Under Gradle Scripts, open build.gradle (Module :app), add the following lines: ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -176,7 +174,7 @@ dependencies { implementation("com.amplifyframework:aws-api:ANDROID_VERSION") // highlight-end // ... other dependencies - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/build-a-backend/storage/set-up-storage/index.mdx b/src/pages/[platform]/build-a-backend/storage/set-up-storage/index.mdx index 3cc43570f9c..2f5879f2d5a 100644 --- a/src/pages/[platform]/build-a-backend/storage/set-up-storage/index.mdx +++ b/src/pages/[platform]/build-a-backend/storage/set-up-storage/index.mdx @@ -566,10 +566,8 @@ Add these libraries into the `dependencies` block: ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -580,7 +578,7 @@ dependencies { implementation("com.amplifyframework:aws-auth-cognito:ANDROID_VERSION") // highlight-end // ... other dependencies - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` diff --git a/src/pages/[platform]/start/platform-setup/index.mdx b/src/pages/[platform]/start/platform-setup/index.mdx index b9924bc9bf0..2d9f0e8cefc 100644 --- a/src/pages/[platform]/start/platform-setup/index.mdx +++ b/src/pages/[platform]/start/platform-setup/index.mdx @@ -152,8 +152,8 @@ android { compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { -- sourceCompatibility = JavaVersion.VERSION_1_8 -- targetCompatibility = JavaVersion.VERSION_1_8 +- sourceCompatibility = JavaVersion.VERSION_11 +- targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } diff --git a/src/pages/[platform]/start/quickstart/index.mdx b/src/pages/[platform]/start/quickstart/index.mdx index 92af74bb2c3..385871d25a7 100644 --- a/src/pages/[platform]/start/quickstart/index.mdx +++ b/src/pages/[platform]/start/quickstart/index.mdx @@ -2269,15 +2269,13 @@ Amplify uses some modern Java APIs that require desugaring to be added for earli ```kotlin title="app/build.gradle.kts" android { compileOptions { - // Support for Java 8 features + // Support for modern Java features isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` @@ -2292,7 +2290,7 @@ The fastest way to get your login experience up and running is to use our Authen ```kotlin title="app/build.gradle.kts" dependencies { implementation("com.amplifyframework.ui:authenticator:ANDROID_AUTHENTICATOR_VERSION") - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:ANDROID_DESUGAR_VERSION") } ``` From 41c73980df14e7a2b3dd99d11e8fb064019be3ae Mon Sep 17 00:00:00 2001 From: tjroach Date: Wed, 12 Nov 2025 16:21:34 -0500 Subject: [PATCH 2/2] revert unintended changes on flutter --- .../lib/project-setup/flutter/platform-setup/android.mdx | 4 ++-- src/pages/[platform]/start/platform-setup/index.mdx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx b/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx index f9d9b200509..609bb2f5264 100644 --- a/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx +++ b/src/fragments/lib/project-setup/flutter/platform-setup/android.mdx @@ -37,8 +37,8 @@ android { compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { -- sourceCompatibility = JavaVersion.VERSION_11 -- targetCompatibility = JavaVersion.VERSION_11 +- sourceCompatibility = JavaVersion.VERSION_1_8 +- targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } diff --git a/src/pages/[platform]/start/platform-setup/index.mdx b/src/pages/[platform]/start/platform-setup/index.mdx index 2d9f0e8cefc..e47c5b3acef 100644 --- a/src/pages/[platform]/start/platform-setup/index.mdx +++ b/src/pages/[platform]/start/platform-setup/index.mdx @@ -87,8 +87,8 @@ android { compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { -- sourceCompatibility = JavaVersion.VERSION_11 -- targetCompatibility = JavaVersion.VERSION_11 +- sourceCompatibility = JavaVersion.VERSION_1_8 +- targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 }