Merge branch 'main' into snapshot

Author: chrisbanes

build.gradle

@@ -71,12 +71,6 @@ subprojects {
         }
     }
 
-    // Create a configuration which allows us to intercept the JARs, and add them to
-    // Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
-    // built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
-    // TODO: Remove this once AGP uses the new Compose Compiler artifact name
-    def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
-
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
         kotlinOptions {
             // Treat all Kotlin warnings as errors
@@ -90,17 +84,6 @@ subprojects {
 
             freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
         }
-
-        compile.dependsOn(compilerPluginConfig)
-        compile.doFirst {
-            if (!compilerPluginConfig.isEmpty()) {
-                // Add the compiler plugin JARs using the -Xplugin flag
-                compile.kotlinOptions.freeCompilerArgs +=
-                        "-Xplugin=${compilerPluginConfig.files.first()}"
-                // Need to turn on the IR compiler too
-                compile.kotlinOptions.useIR = true
-            }
-        }
     }
 
     // Read in the signing.properties file if it is exists

coil/build.gradle

@@ -22,6 +22,10 @@ plugins {
     id 'org.jetbrains.dokka'
 }
 
+kotlin {
+    explicitApi()
+}
+
 android {
     compileSdkVersion 30
 
@@ -37,14 +41,7 @@ android {
 
     buildFeatures {
         buildConfig false
-
-        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
-        // Compose compiler artifact has changed artifact group/name.
-        // Instead we add the compiler manually below in the dependencies {}. Also see
-        // the root build.gradle for info on how to apply the plugin.
-        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-
-        // compose true
+        compose true
     }
 
     composeOptions {
@@ -83,9 +80,6 @@ dependencies {
     api project(':imageloading-core')
     api Libs.Coil.coil
 
-    // Temporary workaround (see above)
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.foundation

imageloading-core/build.gradle

@@ -22,6 +22,10 @@ plugins {
     id 'org.jetbrains.dokka'
 }
 
+kotlin {
+    explicitApi()
+}
+
 android {
     compileSdkVersion 30
 
@@ -37,14 +41,7 @@ android {
 
     buildFeatures {
         buildConfig false
-
-        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
-        // Compose compiler artifact has changed artifact group/name.
-        // Instead we add the compiler manually below in the dependencies {}. Also see
-        // the root build.gradle for info on how to apply the plugin.
-        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-
-        // compose true
+        compose true
     }
 
     composeOptions {
@@ -69,9 +66,6 @@ afterEvaluate {
 dependencies {
     implementation Libs.AndroidX.coreKtx
 
-    // Temporary workaround (see above)
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.foundation
 

imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/MaterialLoadingImage.kt

@@ -121,11 +121,11 @@ fun MaterialLoadingImage(
 ) {
     Image(
         painter = if (fadeInEnabled) {
-            val animatedPainer = remember(painter) {
+            val animatedPainter = remember(painter) {
                 MaterialLoadingPainterWrapper(painter, fadeInDurationMs, clock).also { it.start() }
             }
             // If the animation painter is running, return use it, else use to the painter
-            if (!animatedPainer.isFinished) animatedPainer else painter
+            if (!animatedPainter.isFinished) animatedPainter else painter
         } else {
             // If the fade is disabled, just use the standard ImagePainter
             painter

picasso/build.gradle

@@ -22,6 +22,10 @@ plugins {
     id 'org.jetbrains.dokka'
 }
 
+kotlin {
+    explicitApi()
+}
+
 android {
     compileSdkVersion 30
 
@@ -37,14 +41,7 @@ android {
 
     buildFeatures {
         buildConfig false
-
-        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
-        // Compose compiler artifact has changed artifact group/name.
-        // Instead we add the compiler manually below in the dependencies {}. Also see
-        // the root build.gradle for info on how to apply the plugin.
-        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-
-        // compose true
+        compose true
     }
 
     composeOptions {
@@ -87,8 +84,6 @@ dependencies {
 
     implementation Libs.AndroidX.coreKtx
 
-    // Temporary workaround (see above)
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.foundation
 

sample/build.gradle

@@ -40,13 +40,7 @@ android {
     }
 
     buildFeatures {
-        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
-        // Compose compiler artifact has changed artifact group/name.
-        // Instead we add the compiler manually below in the dependencies {}. Also see
-        // the root build.gradle for info on how to apply the plugin.
-        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-
-        // compose true
+        compose true
     }
 
     composeOptions {
@@ -61,9 +55,6 @@ dependencies {
 
     implementation Libs.Coil.gif
 
-    // Temporary workaround (see above)
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.foundation