WIP: alpha04 release

Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

@@ -21,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha11"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
     const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"
 

JetNews/build.gradle

@@ -24,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-alpha11'
+        classpath 'com.android.tools.build:gradle:4.2.0-alpha12'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

Jetcaster/app/build.gradle

@@ -84,13 +84,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 {
@@ -108,8 +102,6 @@ dependencies {
 
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.Compose.foundation
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.materialIconsExtended

Jetcaster/build.gradle

@@ -64,13 +64,7 @@ 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 ->
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             // Treat all Kotlin warnings as errors
             allWarningsAsErrors = true
@@ -87,16 +81,5 @@ subprojects {
             // Set JVM target to 1.8
             jvmTarget = "1.8"
         }
-
-        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
-            }
-        }
     }
 }

Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

@@ -21,15 +21,15 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.1.0"
 
     object Accompanist {
-        private const val version = "0.2.3.compose-6860046-SNAPSHOT"
+        private const val version = "0.3.0"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -61,10 +61,8 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
 
         object Compose {
-            const val snapshot = "6860046"
-            const val version = "1.0.0-SNAPSHOT"
-
-            const val compiler = "androidx.compose.compiler:compiler:$version"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha04"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"

Jetchat/app/build.gradle

@@ -66,13 +66,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 {
@@ -86,10 +80,6 @@ dependencies {
     implementation Libs.Kotlin.stdlib
     implementation Libs.Coroutines.android
 
-    // Temporary workaround (see above)
-    // TODO: remove Compose.compiler once we upgrade to an AGP version which uses the new artifact details
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.Navigation.fragment

Jetchat/build.gradle

@@ -60,25 +60,8 @@ subprojects {
             licenseHeaderFile rootProject.file('spotless/copyright.kt')
         }
     }
-    // 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 ->
-
-        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
-            }
-        }
 
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             // Treat all Kotlin warnings as errors
             allWarningsAsErrors = true

Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt

@@ -21,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
@@ -47,10 +47,9 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
 
         object Compose {
-            const val snapshot = "6860046"
-            const val version = "1.0.0-SNAPSHOT"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha04"
 
-            const val compiler = "androidx.compose.compiler:compiler:$version"
             const val core = "androidx.compose.ui:ui:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"

Jetsnack/app/build.gradle

@@ -61,13 +61,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
         // Disable unused AGP features
         buildConfig false
         aidl false
@@ -83,9 +77,6 @@ android {
 }
 
 dependencies {
-    // Temporary workaround (see above)
-    // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
 
     implementation Libs.Kotlin.stdlib
 

Jetsnack/build.gradle

@@ -49,31 +49,14 @@ subprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 
-    // 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 ->
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             jvmTarget = '1.8'
             allWarningsAsErrors = true
             freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
             // Opt-in to experimental compose APIs
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
         }
-
-        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
-            }
-        }
     }
     apply plugin: 'com.diffplug.spotless'
     spotless {

Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt

@@ -21,11 +21,11 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
     const val junit = "junit:junit:4.13"
 
     object Accompanist {
-        private const val version = "0.2.3.compose-6860046-SNAPSHOT"
+        private const val version = "0.3.0"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -47,10 +47,9 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
 
         object Compose {
-            const val snapshot = "6860046"
-            const val version = "1.0.0-SNAPSHOT"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha04"
 
-            const val compiler = "androidx.compose.compiler:compiler:$version"
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"

Jetsurvey/app/build.gradle

@@ -64,13 +64,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 {
@@ -94,10 +88,6 @@ dependencies {
     implementation Libs.AndroidX.Material.material
     implementation Libs.material
 
-    // Temporary workaround (see above)
-    // TODO: remove Compose.compiler once we upgrade to an AGP version which uses the new artifact details
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.AndroidX.Compose.layout
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.materialIconsExtended

Jetsurvey/build.gradle

@@ -57,25 +57,7 @@ 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 ->
-
-        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
-            }
-        }
-
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
             freeCompilerArgs += '-Xallow-jvm-ir-dependencies'

Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt

@@ -21,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
@@ -40,10 +40,9 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
 
         object Compose {
-            const val snapshot = "6860046"
-            const val version = "1.0.0-SNAPSHOT"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha04"
 
-            const val compiler = "androidx.compose.compiler:compiler:$version"
             const val core = "androidx.compose.ui:ui:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"

Owl/app/build.gradle

@@ -61,13 +61,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
         // Disable unused AGP features
         buildConfig false
         aidl false
@@ -83,10 +77,6 @@ android {
 }
 
 dependencies {
-    // Temporary workaround (see above)
-    // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.Kotlin.stdlib
 
     implementation Libs.AndroidX.coreKtx

Owl/build.gradle

@@ -46,31 +46,13 @@ subprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 
-    // 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 ->
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             jvmTarget = '1.8'
             allWarningsAsErrors = true
             // Opt-in to experimental compose APIs
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
             freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
-            freeCompilerArgs += "-Xjvm-default=enable"
-        }
-
-        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
-            }
         }
     }