chore: Upgrade to Gradle 8 (#63)

Author: mattcreaser

build-logic/plugins/build.gradle.kts

@@ -20,8 +20,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 ktlint {
@@ -30,7 +30,7 @@ ktlint {
 
 dependencies {
     compileOnly(libs.plugin.android.gradle)
-    compileOnly(libs.plugin.kotlin.gradle)
+    compileOnly(libs.plugin.kotlin.android)
     compileOnly(libs.plugin.dokka)
     compileOnly(libs.plugin.ktlint)
 }

build-logic/plugins/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -21,14 +21,13 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.gradleKotlinDsl
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val optInAnnotations = listOf(
-    "com.amplifyframework.annotations.InternalApiWarning",
-    "com.amplifyframework.annotations.InternalAmplifyApi"
-)
+
 
 /**
  * This convention plugin configures an Android library module
@@ -62,9 +61,9 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 maxHeapSize = "4g"
             }
 
-            tasks.withType<KotlinCompile> {
-                compilerOptions {
-                    freeCompilerArgs.addAll(optInAnnotations.map { "-opt-in=$it" })
+            tasks.withType<KotlinCompile>().configureEach {
+                kotlinOptions {
+                    jvmTarget = JavaVersion.VERSION_11.toString()
                 }
             }
         }
@@ -83,9 +82,12 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
         extension.apply {
             compileSdk = 33
 
+            buildFeatures {
+                buildConfig = true
+            }
+
             defaultConfig {
                 minSdk = 24
-                targetSdk = 33
                 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 testInstrumentationRunnerArguments += "clearPackageData" to "true"
                 consumerProguardFiles += rootProject.file("configuration/consumer-rules.pro")
@@ -107,14 +109,14 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             }
 
             compileOptions {
-                sourceCompatibility = JavaVersion.VERSION_1_8
-                targetCompatibility = JavaVersion.VERSION_1_8
+                sourceCompatibility = JavaVersion.VERSION_11
+                targetCompatibility = JavaVersion.VERSION_11
             }
 
             // Needed when running integration tests. The oauth2 library uses relies on two
             // dependencies (Apache's httpcore and httpclient), both of which include
             // META-INF/DEPENDENCIES. Tried a couple other options to no avail.
-            packagingOptions {
+            packaging {
                 resources.excludes.add("META-INF/DEPENDENCIES")
             }
 

build-logic/plugins/src/main/kotlin/ComponentConventionPlugin.kt

@@ -13,8 +13,16 @@
  * permissions and limitations under the License.
  */
 
+import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val optInAnnotations = listOf(
+    "com.amplifyframework.annotations.InternalApiWarning",
+    "com.amplifyframework.annotations.InternalAmplifyApi"
+)
 
 /**
  * Shared plugin for UI component libraries
@@ -25,6 +33,12 @@ class ComponentConventionPlugin : Plugin<Project> {
             pluginManager.apply("amplify.android.library")
             pluginManager.apply("amplify.android.publishing")
             pluginManager.apply("amplify.android.dokka")
+
+            tasks.withType<KotlinCompile>().configureEach {
+                kotlinOptions {
+                    freeCompilerArgs = freeCompilerArgs + optInAnnotations.map { "-opt-in=$it" }
+                }
+            }
         }
     }
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "7.3.1"
+agp = "8.0.0"
 amplify = "2.8.7"
 cameraX = "1.2.0"
 compose = "1.3.2"
@@ -47,7 +47,7 @@ test-robolectric = "org.robolectric:robolectric:4.9.2"
 
 # Dependencies for convention plugins
 plugin-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
-plugin-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+plugin-kotlin-android = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 plugin-ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Nov 30 09:21:44 EST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists