chore: Fix building in Android Studio Ladybug (#2961)

Co-authored-by: Tyler Roach <[email protected]>
aws-amplify · Dec 18, 2024 · 5082c00 · 5082c00
1 parent efa5e69
commit 5082c00
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,7 +87,7 @@ __pycache__/
 **/credentials.json
 **/google_client_creds.json
 **/amplifyconfiguration*.json
-**/amplify_outputs.json
+**/amplify_outputs*.json
 
 # IDE files
 .idea/**
@@ -103,7 +103,6 @@ dist/
 node_modules/
 aws-exports.js
 awsconfiguration.json
-amplifyconfiguration.json
 
 test-results/
 build-artifacts/

diff --git a/apollo/apollo-appsync-amplify/build.gradle.kts b/apollo/apollo-appsync-amplify/build.gradle.kts
@@ -57,7 +57,3 @@ dependencies {
     androidTestImplementation(libs.test.kotlin.coroutines)
     androidTestImplementation(libs.test.turbine)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-analytics-pinpoint/build.gradle.kts b/aws-analytics-pinpoint/build.gradle.kts
@@ -57,7 +57,3 @@ dependencies {
     androidTestImplementation(libs.test.androidx.junit)
     androidTestImplementation(project(":aws-analytics-pinpoint"))
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-api-appsync/build.gradle.kts b/aws-api-appsync/build.gradle.kts
@@ -41,7 +41,3 @@ dependencies {
     testImplementation(project(":testmodels"))
     testImplementation(project(":testutils"))
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-api/build.gradle.kts b/aws-api/build.gradle.kts
@@ -69,7 +69,3 @@ dependencies {
 
     androidTestUtil(libs.test.androidx.orchestrator)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-auth-cognito/build.gradle.kts b/aws-auth-cognito/build.gradle.kts
@@ -80,7 +80,3 @@ dependencies {
     androidTestImplementation(project(":aws-api-appsync"))
     androidTestImplementation(project(":testutils"))
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-auth-plugins-core/build.gradle.kts b/aws-auth-plugins-core/build.gradle.kts
@@ -26,9 +26,6 @@ group = properties["POM_GROUP"].toString()
 
 android {
     namespace = "com.amplifyframework.plugins.core"
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 dependencies {

diff --git a/aws-datastore/build.gradle.kts b/aws-datastore/build.gradle.kts
@@ -62,7 +62,3 @@ dependencies {
     androidTestImplementation(libs.okhttp)
     androidTestImplementation(libs.oauth2)
 }
-
-afterEvaluate {
-    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
-}
diff --git a/aws-geo-location/build.gradle.kts b/aws-geo-location/build.gradle.kts
@@ -43,7 +43,3 @@ dependencies {
     androidTestImplementation(libs.test.androidx.runner)
     androidTestImplementation(libs.test.androidx.junit)
 }
-
-afterEvaluate {
-    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
-}
diff --git a/aws-logging-cloudwatch/build.gradle.kts b/aws-logging-cloudwatch/build.gradle.kts
@@ -62,7 +62,3 @@ dependencies {
     androidTestImplementation(project(":aws-logging-cloudwatch"))
     androidTestImplementation(project(":testutils"))
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-pinpoint-core/build.gradle.kts b/aws-pinpoint-core/build.gradle.kts
@@ -49,7 +49,3 @@ dependencies {
     androidTestImplementation(libs.test.androidx.runner)
     androidTestImplementation(libs.test.androidx.junit)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-predictions/build.gradle.kts b/aws-predictions/build.gradle.kts
@@ -56,7 +56,3 @@ dependencies {
     androidTestImplementation(libs.test.mockk.android)
     androidTestImplementation(libs.rxjava)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/aws-push-notifications-pinpoint-common/build.gradle.kts b/aws-push-notifications-pinpoint-common/build.gradle.kts
@@ -25,9 +25,6 @@ group = properties["POM_GROUP"].toString()
 
 android {
     namespace = "com.amplifyframework.pushnotifications.pinpoint.common"
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 dependencies {

diff --git a/aws-storage-s3/build.gradle.kts b/aws-storage-s3/build.gradle.kts
@@ -66,7 +66,3 @@ dependencies {
 
     androidTestUtil(libs.test.androidx.orchestrator)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,6 +16,7 @@
 import app.cash.licensee.LicenseeExtension
 import com.android.build.gradle.LibraryExtension
 import kotlinx.validation.ApiValidationExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
@@ -47,7 +48,7 @@ allprojects {
         tasks.withType<JavaCompile>().configureEach {
             options.compilerArgs.apply {
                 add("-Xlint:all")
-                add("-Werror")
+                //add("-Werror")
             }
         }
         tasks.withType<Test>().configureEach {
@@ -110,6 +111,12 @@ subprojects {
             }
         }
     }
+
+    pluginManager.withPlugin("kotlin-android") {
+        configure<KotlinProjectExtension> {
+            jvmToolchain(17)
+        }
+    }
 }
 
 @Suppress("ExpiredTargetSdkVersion")
@@ -158,14 +165,6 @@ fun Project.configureAndroid() {
 
             compileOptions {
                 isCoreLibraryDesugaringEnabled = true
-                sourceCompatibility = JavaVersion.VERSION_11
-                targetCompatibility = JavaVersion.VERSION_11
-            }
-
-            tasks.withType<KotlinCompile>().configureEach {
-                kotlinOptions {
-                    jvmTarget = JavaVersion.VERSION_11.toString()
-                }
             }
 
             // Needed when running integration tests. The oauth2 library uses relies on two

diff --git a/core-kotlin/build.gradle.kts b/core-kotlin/build.gradle.kts
@@ -39,8 +39,3 @@ dependencies {
     testImplementation(project(":testmodels"))
     testImplementation(libs.test.kotest.assertions)
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-    freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
-}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -67,10 +67,6 @@ dependencies {
     androidTestImplementation(libs.test.androidx.fragment)
 }
 
-android.kotlinOptions {
-    jvmTarget = "11"
-}
-
 afterEvaluate {
     // Disables this warning:
     // warning: listOf(classfile) MethodParameters attribute

diff --git a/maplibre-adapter/build.gradle.kts b/maplibre-adapter/build.gradle.kts
@@ -25,9 +25,6 @@ group = properties["POM_GROUP"].toString()
 
 android {
     namespace = "com.amplifyframework.geo.maplibre"
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
     lint {
         disable += "GradleDependency"
     }

diff --git a/rxbindings/build.gradle.kts b/rxbindings/build.gradle.kts
@@ -42,7 +42,3 @@ dependencies {
     testImplementation(libs.test.robolectric)
     testImplementation(project(":rxbindings"))
 }
-
-android.kotlinOptions {
-    jvmTarget = "11"
-}