Skip to content

Commit b7a41d3

Browse files
committed
chore(datastore,notifications): Fixed Android desugar complication error
1 parent 6cb3a56 commit b7a41d3

File tree

17 files changed

+22
-15
lines changed

17 files changed

+22
-15
lines changed

packages/amplify/amplify_flutter/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/amplify_datastore/android/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ android {
5555
htmlReport false
5656
}
5757
compileOptions {
58+
coreLibraryDesugaringEnabled true
59+
5860
sourceCompatibility JavaVersion.VERSION_17
5961
targetCompatibility JavaVersion.VERSION_17
6062
}
@@ -73,6 +75,8 @@ android {
7375
}
7476

7577
dependencies {
78+
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.0"
79+
7680
implementation 'com.amplifyframework:aws-auth-cognito:2.21.1'
7781
implementation "com.amplifyframework:aws-api:2.21.1"
7882
implementation "com.amplifyframework:aws-datastore:2.21.1"

packages/amplify_datastore/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/amplify_native_legacy_wrapper/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/analytics/amplify_analytics_pinpoint/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/api/amplify_api/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/auth/amplify_auth_cognito/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/authenticator/amplify_authenticator/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/authenticator/amplify_authenticator_test/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/common/amplify_db_common/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/notifications/push/amplify_push_notifications/android/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ android {
3030
compileSdk 34
3131

3232
compileOptions {
33+
coreLibraryDesugaringEnabled true
34+
3335
sourceCompatibility JavaVersion.VERSION_17
3436
targetCompatibility JavaVersion.VERSION_17
3537
}
@@ -63,6 +65,7 @@ android {
6365
}
6466

6567
dependencies {
68+
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.0"
6669
api "com.google.firebase:firebase-messaging:23.2.0"
6770
// Import support library for Amplify push utils
6871
implementation 'com.amplifyframework:aws-push-notifications-pinpoint-common:2.21.1'

packages/notifications/push/amplify_push_notifications/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/notifications/push/amplify_push_notifications_pinpoint/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/secure_storage/amplify_secure_storage/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/storage/amplify_storage_s3/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33
android.enableJetifier=true

templates/flutter-package/__brick__/example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)