Merge pull request #2232 from HuiSF/fix/datastore-android-java8

HuiSF · web-flow · commit 34b4c0176f68 · 2022-10-11T12:40:51.000-07:00
fix(datastore): enable java8 desugaring for amplify-android datastore…
diff --git a/packages/amplify_datastore/android/build.gradle b/packages/amplify_datastore/android/build.gradle
@@ -53,6 +53,8 @@ android {
         htmlReport false
     }
     compileOptions {
+        // Support for Java 8 features
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -69,6 +71,9 @@ android {
 }
 
 dependencies {
+    // Support for Java 8 features
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
     implementation "com.amplifyframework:aws-datastore:1.37.2"
     implementation "com.amplifyframework:aws-api-appsync:1.37.2"
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ android {`
`53`	`53`	`htmlReport false`
`54`	`54`	`}`
`55`	`55`	`compileOptions {`
	`56`	`+ // Support for Java 8 features`
	`57`	`+ coreLibraryDesugaringEnabled true`
`56`	`58`	`sourceCompatibility JavaVersion.VERSION_1_8`
`57`	`59`	`targetCompatibility JavaVersion.VERSION_1_8`
`58`	`60`	`}`
`@@ -69,6 +71,9 @@ android {`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`dependencies {`
	`74`	`+ // Support for Java 8 features`
	`75`	`+ coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'`
	`76`	`+`
`72`	`77`	`implementation "com.amplifyframework:aws-datastore:1.37.2"`
`73`	`78`	`implementation "com.amplifyframework:aws-api-appsync:1.37.2"`
`74`	`79`