Fix Compose project KotlinCompile task remote caching
- Add androidxCompose extension that allows to disable adding
Compose Kotlin Compiler plugin to KotlinCompile
- Switch from onlyIf to doLast for setting arguments to use
a clever Gradle hack used by AGP to make sure that our arguments
do not get tracked when task inputs are calculated allowing us
to avoid absolute paths being considered as task input.
- Add metrics and reports providers as task inputs as well to make
sure KotlinCompile is invalidated when these change
Test: ./gradlew -p compose assembleDebug -> passes
Change-Id: If00cdf4008d17fc02f2b2a62711c8dea5aeec9ac
diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index 0e27b21..43b6a5a 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
api("androidx.compose.runtime:runtime:1.0.1")
diff --git a/activity/activity-compose/integration-tests/activity-demos/build.gradle b/activity/activity-compose/integration-tests/activity-demos/build.gradle
index c731d6b..5b17987 100644
--- a/activity/activity-compose/integration-tests/activity-demos/build.gradle
+++ b/activity/activity-compose/integration-tests/activity-demos/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
implementation projectOrArtifact(":activity:activity-compose")
implementation projectOrArtifact(":activity:activity-compose:activity-compose-samples")
diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle
index 5103f66..740db84 100644
--- a/activity/activity-compose/samples/build.gradle
+++ b/activity/activity-compose/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly projectOrArtifact(":annotation:annotation-sampled")
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeExtension.kt
new file mode 100644
index 0000000..4df37edf
--- /dev/null
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeExtension.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.build
+
+import org.gradle.api.Project
+
+open class AndroidXComposeExtension(@Suppress("UNUSED_PARAMETER") project: Project) {
+ var composeCompilerPluginEnabled = true
+}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeImplPlugin.kt
index e98296f..998c6ad 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeImplPlugin.kt
@@ -31,13 +31,13 @@
import kotlin.reflect.KFunction
import org.gradle.api.Plugin
import org.gradle.api.Project
-import org.gradle.api.artifacts.ExternalModuleDependency
import org.gradle.api.artifacts.type.ArtifactTypeDefinition
import org.gradle.api.attributes.Attribute
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.api.tasks.ClasspathNormalizer
import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.findByType
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
@@ -63,6 +63,10 @@
override fun apply(project: Project) {
val f: KFunction<Unit> = Companion::applyAndConfigureKotlinPlugin
project.extensions.add("applyAndConfigureKotlinPlugin", f)
+ val extension = project.extensions.create<AndroidXComposeExtension>(
+ "androidxCompose",
+ project
+ )
project.plugins.all { plugin ->
when (plugin) {
is LibraryPlugin -> {
@@ -78,7 +82,7 @@
project.configureAndroidCommonOptions(app)
}
is KotlinBasePluginWrapper -> {
- project.configureComposeImplPluginForAndroidx()
+ configureComposeCompilerPlugin(project, extension)
if (plugin is KotlinMultiplatformPluginWrapper) {
project.configureForMultiplatform()
@@ -312,46 +316,66 @@
}
}
-fun Project.configureComposeImplPluginForAndroidx() {
+private const val COMPILER_PLUGIN_CONFIGURATION = "kotlinPlugin"
- val conf = project.configurations.create("kotlinPlugin")
- val kotlinPlugin = conf.incoming.artifactView { view ->
- view.attributes { attributes ->
- attributes.attribute(
- Attribute.of("artifactType", String::class.java),
- ArtifactTypeDefinition.JAR_TYPE
- )
- }
- }.files
+private fun configureComposeCompilerPlugin(
+ project: Project,
+ extension: AndroidXComposeExtension
+) {
+ project.afterEvaluate {
+ // If a project has opted-out of Compose compiler plugin, don't add it
+ if (!extension.composeCompilerPluginEnabled) return@afterEvaluate
- val isTipOfTreeComposeCompilerProvider = project.provider {
- (!conf.isEmpty) && (conf.dependencies.first() !is ExternalModuleDependency)
- }
- val enableMetricsProvider = project.providers.gradleProperty(enableMetricsArg)
- val enableReportsProvider = project.providers.gradleProperty(enableReportsArg)
+ val androidXExtension = project.extensions.findByType(AndroidXExtension::class.java)
+ ?: throw Exception("You have applied AndroidXComposePlugin without AndroidXPlugin")
+ val shouldPublish = androidXExtension.shouldPublish()
- val libraryMetricsDirectory = project.rootProject.getLibraryMetricsDirectory()
- val libraryReportsDirectory = project.rootProject.getLibraryReportsDirectory()
- project.tasks.withType(KotlinCompile::class.java).configureEach { compile ->
- // TODO(b/157230235): remove when this is enabled by default
- compile.kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
- compile.inputs.files({ kotlinPlugin })
- .withPropertyName("composeCompilerExtension")
- .withNormalizer(ClasspathNormalizer::class.java)
- compile.onlyIf {
- if (!kotlinPlugin.isEmpty) {
- compile.kotlinOptions.freeCompilerArgs +=
- "-Xplugin=${kotlinPlugin.first()}"
+ // Create configuration that we'll use to load Compose compiler plugin
+ val configuration = project.configurations.create(COMPILER_PLUGIN_CONFIGURATION)
+ // Add Compose compiler plugin to kotlinPlugin configuration, making sure it works
+ // for Playground builds as well
+ project.dependencies.add(
+ COMPILER_PLUGIN_CONFIGURATION,
+ if (StudioType.isPlayground(project)) {
+ AndroidXPlaygroundRootImplPlugin.projectOrArtifact(
+ project.rootProject,
+ ":compose:compiler:compiler"
+ )
+ } else {
+ project.rootProject.findProject(":compose:compiler:compiler")!!
+ }
+ )
+ val kotlinPlugin = configuration.incoming.artifactView { view ->
+ view.attributes { attributes ->
+ attributes.attribute(
+ Attribute.of("artifactType", String::class.java),
+ ArtifactTypeDefinition.JAR_TYPE
+ )
+ }
+ }.files
- val enableMetrics = (enableMetricsProvider.orNull == "true")
+ val enableMetricsProvider = project.providers.gradleProperty(enableMetricsArg)
+ val enableReportsProvider = project.providers.gradleProperty(enableReportsArg)
- val enableReports = (enableReportsProvider.orNull == "true")
+ val libraryMetricsDirectory = project.rootProject.getLibraryMetricsDirectory()
+ val libraryReportsDirectory = project.rootProject.getLibraryReportsDirectory()
+ project.tasks.withType(KotlinCompile::class.java).configureEach { compile ->
+ // TODO(b/157230235): remove when this is enabled by default
+ compile.kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
- // since metrics reports in compose compiler are a new feature, we only want to
- // pass in this parameter for modules that are using the tip of tree compose
- // compiler, or else we will run into an exception since the parameter will not
- // be recognized.
- if (isTipOfTreeComposeCompilerProvider.get() && enableMetrics) {
+ // Append inputs to KotlinCompile so tasks get invalidated if any of these values change
+ compile.inputs.files({ kotlinPlugin })
+ .withPropertyName("composeCompilerExtension")
+ .withNormalizer(ClasspathNormalizer::class.java)
+ compile.inputs.property("composeMetricsEnabled", enableMetricsProvider).optional(true)
+ compile.inputs.property("composeReportsEnabled", enableReportsProvider).optional(true)
+
+ // Gradle hack ahead, we use of absolute paths, but is OK here because we do it in
+ // doFirst which happens after Gradle task input snapshotting. AGP does the same.
+ compile.doFirst {
+ compile.kotlinOptions.freeCompilerArgs += "-Xplugin=${kotlinPlugin.first()}"
+
+ if (enableMetricsProvider.orNull == "true") {
val metricsDest = File(libraryMetricsDirectory, "compose")
compile.kotlinOptions.freeCompilerArgs +=
listOf(
@@ -359,12 +383,7 @@
"$composeMetricsOption=${metricsDest.absolutePath}"
)
}
-
- // since metrics reports in compose compiler are a new feature, we only want to
- // pass in this parameter for modules that are using the tip of tree compose
- // compiler, or else we will run into an exception since the parameter will not
- // be recognized.
- if (isTipOfTreeComposeCompilerProvider.get() && enableReports) {
+ if ((enableReportsProvider.orNull == "true")) {
val reportsDest = File(libraryReportsDirectory, "compose")
compile.kotlinOptions.freeCompilerArgs +=
listOf(
@@ -372,25 +391,10 @@
"$composeReportsOption=${reportsDest.absolutePath}"
)
}
- }
- true
- }
- }
-
- project.afterEvaluate {
- val androidXExtension =
- project.extensions.findByType(AndroidXExtension::class.java)
- if (androidXExtension != null) {
- if (androidXExtension.shouldPublish()) {
- project.tasks.withType(KotlinCompile::class.java)
- .configureEach { compile ->
- compile.doFirst {
- if (!kotlinPlugin.isEmpty) {
- compile.kotlinOptions.freeCompilerArgs +=
- listOf("-P", composeSourceOption)
- }
- }
- }
+ if (shouldPublish) {
+ compile.kotlinOptions.freeCompilerArgs +=
+ listOf("-P", composeSourceOption)
+ }
}
}
}
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index 410777d..8612bb7 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -48,7 +48,6 @@
// Compose
def compose_version = "1.1.1"
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation("androidx.activity:activity-compose:1.5.0-alpha03")
implementation("androidx.compose.material:material:$compose_version")
implementation("androidx.compose.ui:ui:$compose_version")
diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle
index 4060050..4adeee4 100644
--- a/camera/integration-tests/diagnosetestapp/build.gradle
+++ b/camera/integration-tests/diagnosetestapp/build.gradle
@@ -18,7 +18,6 @@
id("AndroidXPlugin")
id("com.android.application")
id("kotlin-android")
- id("AndroidXComposePlugin")
}
android {
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 4879ddf..072b0f5 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -60,7 +60,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
// Internal library
implementation(libs.kotlinStdlib)
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index 1555cb4..0623a35 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -15,13 +15,10 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
id("kotlin-android")
- id("AndroidXComposePlugin")
}
android {
@@ -37,6 +34,9 @@
shrinkResources true
}
}
+ lintOptions {
+ disable("SyntheticAccessor")
+ }
namespace "androidx.camera.integration.viewfinder"
}
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index 26c8d34..0f6a227 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -80,7 +80,6 @@
implementation("androidx.appcompat:appcompat:1.3.0")
// Compose UI
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(project(":compose:runtime:runtime"))
implementation("androidx.compose.ui:ui:1.0.5")
implementation("androidx.compose.material:material:1.0.5")
diff --git a/compose/animation/animation-core/benchmark/build.gradle b/compose/animation/animation-core/benchmark/build.gradle
index 9dced2d..2b93098 100644
--- a/compose/animation/animation-core/benchmark/build.gradle
+++ b/compose/animation/animation-core/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":compose:animation:animation-core")
androidTestImplementation project(":benchmark:benchmark-junit4")
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 1d3e17f..86b1035 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -28,8 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
* When updating dependencies, make sure to make the an an analogous update in the
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index 738db47..00508bf 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -25,8 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
implementation(libs.kotlinStdlib)
compileOnly(project(":annotation:annotation-sampled"))
implementation(project(":compose:animation:animation-core"))
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index 4831bbc..8d4b5f4 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
* When updating dependencies, make sure to make the an an analogous update in the
diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle
index cc264a1..9077e37 100644
--- a/compose/animation/animation-graphics/samples/build.gradle
+++ b/compose/animation/animation-graphics/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index 74a32d0..24ce3d8 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -28,8 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
* When updating dependencies, make sure to make the an an analogous update in the
diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle
index 3866716..a44d97e 100644
--- a/compose/animation/animation/integration-tests/animation-demos/build.gradle
+++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle
@@ -6,8 +6,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
implementation(libs.kotlinStdlib)
implementation(project(":compose:foundation:foundation-layout"))
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 9a3b857..d039190 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -25,8 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
implementation(libs.kotlinStdlib)
compileOnly(project(":annotation:annotation-sampled"))
diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle
index e1aba8e..1ff5a1a 100644
--- a/compose/benchmark-utils/benchmark/build.gradle
+++ b/compose/benchmark-utils/benchmark/build.gradle
@@ -23,8 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
-
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation project(":compose:benchmark-utils")
androidTestImplementation project(":compose:runtime:runtime")
diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle
index a79fec1..df64ee9 100644
--- a/compose/benchmark-utils/build.gradle
+++ b/compose/benchmark-utils/build.gradle
@@ -22,8 +22,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
-
api("androidx.activity:activity:1.2.0")
api(project(":compose:test-utils"))
api(project(":benchmark:benchmark-junit4"))
diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle
index 8c9863c..07d8fdf 100644
--- a/compose/desktop/desktop/build.gradle
+++ b/compose/desktop/desktop/build.gradle
@@ -27,7 +27,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
}
kotlin {
diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle
index 1668f8b..91089c4 100644
--- a/compose/desktop/desktop/samples/build.gradle
+++ b/compose/desktop/desktop/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
}
kotlin {
diff --git a/compose/foundation/foundation-layout/benchmark/build.gradle b/compose/foundation/foundation-layout/benchmark/build.gradle
index af32431..62442df 100644
--- a/compose/foundation/foundation-layout/benchmark/build.gradle
+++ b/compose/foundation/foundation-layout/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation project(":compose:foundation:foundation-layout")
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 123ef41..589afa1 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
index 4af954d..e9a5acb 100644
--- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
+++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle
index 905cda5..89efd9b 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle
index ceb374c..7da93b7 100644
--- a/compose/foundation/foundation/benchmark/build.gradle
+++ b/compose/foundation/foundation/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation project(":compose:runtime:runtime")
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 6fa1923..e4bbb40 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
index 6f16f63..ead143e 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index fa88856..ef5313b 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 63a74b0..d1e40f6 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -6,7 +6,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(project(":compose:animation:animation:integration-tests:animation-demos"))
implementation(project(":compose:foundation:foundation-layout:integration-tests:foundation-layout-demos"))
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index 116ae64..cf434ee 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
api("androidx.activity:activity:1.2.0")
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index 3957f71..c6bf227 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -29,7 +29,6 @@
implementation("androidx.activity:activity-ktx:1.1.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(project(":compose:animation:animation-graphics"))
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":compose:material:material"))
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 8849087..379fe42 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -19,7 +19,6 @@
dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":activity:activity-compose"))
diff --git a/compose/integration-tests/material-catalog/build.gradle b/compose/integration-tests/material-catalog/build.gradle
index b755b7e..f3dfd03 100644
--- a/compose/integration-tests/material-catalog/build.gradle
+++ b/compose/integration-tests/material-catalog/build.gradle
@@ -43,7 +43,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
implementation project(":compose:runtime:runtime")
implementation project(":compose:foundation:foundation-layout")
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index 67d2896..ec367a4 100644
--- a/compose/material/material-icons-core/build.gradle
+++ b/compose/material/material-icons-core/build.gradle
@@ -33,7 +33,6 @@
* When updating dependencies, make sure to make the an an analogous update in the
* corresponding block below
*/
- kotlinPlugin(project(":compose:compiler:compiler"))
api("androidx.compose.ui:ui:1.0.0")
implementation("androidx.compose.runtime:runtime:1.1.1")
diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle
index ffaf157..9a11824 100644
--- a/compose/material/material-icons-core/samples/build.gradle
+++ b/compose/material/material-icons-core/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index 4379019..2fde1e8 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -36,7 +36,6 @@
apply from: "shared-dependencies.gradle"
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/material/material-icons-extended/generate.gradle b/compose/material/material-icons-extended/generate.gradle
index 324011a..aed94d9 100644
--- a/compose/material/material-icons-extended/generate.gradle
+++ b/compose/material/material-icons-extended/generate.gradle
@@ -28,10 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
apply from: "${buildscript.sourceFile.parentFile}/shared-dependencies.gradle"
-dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-}
-
if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
// We're not sure how to merge icons jars when multiplatform is enabled
IconGenerationTask.registerExtendedIconThemeProject(
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle
index 3187f25..2704c77 100644
--- a/compose/material/material-ripple/build.gradle
+++ b/compose/material/material-ripple/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle
index 38cb333..4ffcb6a 100644
--- a/compose/material/material/benchmark/build.gradle
+++ b/compose/material/material/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation project(":compose:runtime:runtime")
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index d0a021c..441abb1 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -26,7 +26,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle
index 0d2aede..15bc9f9 100644
--- a/compose/material/material/integration-tests/material-catalog/build.gradle
+++ b/compose/material/material/integration-tests/material-catalog/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
implementation project(":core:core")
implementation project(":compose:runtime:runtime")
diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle
index e24f00e..af6d579 100644
--- a/compose/material/material/integration-tests/material-demos/build.gradle
+++ b/compose/material/material/integration-tests/material-demos/build.gradle
@@ -8,7 +8,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":compose:foundation:foundation"))
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle
index 2b4db5e..39c79db 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/material3/material3-window-size-class/build.gradle b/compose/material3/material3-window-size-class/build.gradle
index 79f4095..8706f1e 100644
--- a/compose/material3/material3-window-size-class/build.gradle
+++ b/compose/material3/material3-window-size-class/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/material3/material3-window-size-class/samples/build.gradle b/compose/material3/material3-window-size-class/samples/build.gradle
index 971e06a..eaa7cb9 100644
--- a/compose/material3/material3-window-size-class/samples/build.gradle
+++ b/compose/material3/material3-window-size-class/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 5000b8d..fdcff38 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -29,7 +29,6 @@
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/material3/material3/integration-tests/material3-catalog/build.gradle b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
index aab5ebb..189003f 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
implementation project(":core:core")
implementation project(":compose:runtime:runtime")
diff --git a/compose/material3/material3/integration-tests/material3-demos/build.gradle b/compose/material3/material3/integration-tests/material3-demos/build.gradle
index c2a235f..fc83ff8 100644
--- a/compose/material3/material3/integration-tests/material3-demos/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-demos/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index 62d5775..aae7722 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index 6a3637f..68eb4e6 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle
index ab013ee..1c512e5 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 792963e..ecf556a8 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle
index 1c84da2..661406b 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index 372b6fc..bc209c1 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle
index 76438f1..2f96630 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
index c401344..cf8f78a 100644
--- a/compose/runtime/runtime-saveable/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/* When updating dependencies, make sure to make the an an analogous update in the
diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle
index d1335e4..bb106b9 100644
--- a/compose/runtime/runtime-saveable/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index 7a038b9..69ceccb 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
index 97bddfc..757dad6a 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -32,7 +32,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
androidTestImplementation(projectOrArtifact(":compose:ui:ui"))
androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4"))
diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle
index f78341a..36e4ef4 100644
--- a/compose/runtime/runtime/integration-tests/build.gradle
+++ b/compose/runtime/runtime/integration-tests/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
androidTestImplementation(projectOrArtifact(":compose:ui:ui"))
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle
index 16bddd4..88d6075 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index f1c7804..4f1ce49 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/ui/ui-graphics/benchmark/build.gradle b/compose/ui/ui-graphics/benchmark/build.gradle
index 663dea2..f96bd8a 100644
--- a/compose/ui/ui-graphics/benchmark/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/build.gradle
@@ -23,8 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
-
implementation project(":compose:foundation:foundation")
implementation project(":compose:runtime:runtime")
implementation project(":compose:benchmark-utils")
diff --git a/compose/ui/ui-graphics/benchmark/test/build.gradle b/compose/ui/ui-graphics/benchmark/test/build.gradle
index f0c4f1c..550e37c 100644
--- a/compose/ui/ui-graphics/benchmark/test/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/test/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":compose:foundation:foundation")
androidTestImplementation project(":compose:runtime:runtime")
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 90534f6..4947947 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -154,6 +154,10 @@
legacyDisableKotlinStrictApiMode = true
}
+androidxCompose {
+ composeCompilerPluginEnabled = false
+}
+
android {
namespace "androidx.compose.ui.graphics"
}
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle
index 604e896..f3b7b83 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -24,8 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
-
implementation(libs.kotlinStdlib)
compileOnly(project(":annotation:annotation-sampled"))
diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle
index 3da47da..be2d016b 100644
--- a/compose/ui/ui-inspection/build.gradle
+++ b/compose/ui/ui-inspection/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation("androidx.annotation:annotation:1.1.0")
// Following dependencies will be provided by inspected app itself
// because compose:ui-inspector can be run only in app with compose:ui:ui
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index e907375..cf2c7bc 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -34,7 +34,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api(project(":compose:ui:ui-test"))
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
index d052e50..f41f973 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
debugImplementation(project(":compose:ui:ui-test-manifest"))
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index 47c452a..4208e21 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -41,7 +41,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api("androidx.compose.runtime:runtime:1.1.1")
diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle
index 1fe96d3..9b731ad 100644
--- a/compose/ui/ui-test/samples/build.gradle
+++ b/compose/ui/ui-test/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-text-google-fonts/build.gradle b/compose/ui/ui-text-google-fonts/build.gradle
index 5f637d7..b4f694d 100644
--- a/compose/ui/ui-text-google-fonts/build.gradle
+++ b/compose/ui/ui-text-google-fonts/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-text/benchmark/build.gradle b/compose/ui/ui-text/benchmark/build.gradle
index 14b4844..bf6e10a 100644
--- a/compose/ui/ui-text/benchmark/build.gradle
+++ b/compose/ui/ui-text/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation project(":benchmark:benchmark-junit4")
implementation project(":compose:runtime:runtime")
implementation project(":compose:ui:ui-test-junit4")
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle
index 4d1e039..5086471 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle
index 54054bf..9ced650 100644
--- a/compose/ui/ui-tooling-data/build.gradle
+++ b/compose/ui/ui-tooling-data/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index b49f81c..47aed24 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle
index 253a1ed..2812e35 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index 28f6ce0..ec838b5 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -89,6 +89,10 @@
legacyDisableKotlinStrictApiMode = true
}
+androidxCompose {
+ composeCompilerPluginEnabled = false
+}
+
android {
namespace "androidx.compose.ui.util"
}
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index 3b1f650..dca93c8 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":compose:ui:ui"))
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index 626cf9b..a3497b5 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(project(":annotation:annotation-sampled"))
diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle
index 08d303f..0b58476 100644
--- a/compose/ui/ui/benchmark/build.gradle
+++ b/compose/ui/ui/benchmark/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation("androidx.activity:activity-compose:1.3.1")
androidTestImplementation(project(":benchmark:benchmark-junit4"))
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index a5c8c94..bcd92ae 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -29,7 +29,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle
index f566ed5..381a6f7 100644
--- a/compose/ui/ui/integration-tests/ui-demos/build.gradle
+++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle
@@ -6,7 +6,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(libs.material)
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle
index 6db2727..0d017b8 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(libs.material)
diff --git a/datastore/datastore-compose-samples/build.gradle b/datastore/datastore-compose-samples/build.gradle
index 99a82555..b22a33c 100644
--- a/datastore/datastore-compose-samples/build.gradle
+++ b/datastore/datastore-compose-samples/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.protobufLite)
implementation(libs.kotlinStdlib)
diff --git a/development/project-creator/compose-template/groupId/artifactId/build.gradle b/development/project-creator/compose-template/groupId/artifactId/build.gradle
index 97901de..2fd97e3 100644
--- a/development/project-creator/compose-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/compose-template/groupId/artifactId/build.gradle
@@ -28,7 +28,6 @@
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
/*
diff --git a/glance/glance-appwidget-preview/build.gradle b/glance/glance-appwidget-preview/build.gradle
index d10969f..28af11e 100644
--- a/glance/glance-appwidget-preview/build.gradle
+++ b/glance/glance-appwidget-preview/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project, /* isMultiplatformEnabled= */false)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
api(libs.kotlinStdlib)
api(libs.kotlinReflect)
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index 2b9509f..92af5d1 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -40,7 +40,6 @@
path: ":glance:glance-appwidget-proto",
configuration: "export"
))
- kotlinPlugin(project(":compose:compiler:compiler"))
api(project(":glance:glance"))
api("androidx.annotation:annotation:1.1.0")
diff --git a/glance/glance-appwidget/integration-tests/demos/build.gradle b/glance/glance-appwidget/integration-tests/demos/build.gradle
index 31d913f..5a3147a 100644
--- a/glance/glance-appwidget/integration-tests/demos/build.gradle
+++ b/glance/glance-appwidget/integration-tests/demos/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":glance:glance"))
diff --git a/glance/glance-appwidget/integration-tests/template-demos/build.gradle b/glance/glance-appwidget/integration-tests/template-demos/build.gradle
index 9ea2f5e..6f5933f 100644
--- a/glance/glance-appwidget/integration-tests/template-demos/build.gradle
+++ b/glance/glance-appwidget/integration-tests/template-demos/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":glance:glance"))
diff --git a/glance/glance-wear-tiles/build.gradle b/glance/glance-wear-tiles/build.gradle
index 8d50394..c5964c5 100644
--- a/glance/glance-wear-tiles/build.gradle
+++ b/glance/glance-wear-tiles/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project, /* isMultiplatformEnabled= */false)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
api(project(":glance:glance"))
api("androidx.compose.runtime:runtime:1.1.0-beta01")
diff --git a/glance/glance-wear-tiles/integration-tests/demos/build.gradle b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
index 7133006..6d8584b 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/build.gradle
+++ b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
@@ -22,7 +22,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":glance:glance"))
diff --git a/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle b/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
index 9b4347d..673adb4 100644
--- a/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
+++ b/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
@@ -23,7 +23,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":glance:glance"))
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 094a581..804fbf6 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -28,7 +28,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project, /* isMultiplatformEnabled= */false)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
api("androidx.annotation:annotation:1.2.0")
api("androidx.compose.runtime:runtime:1.1.0-beta01")
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index ce6ed25..a24b766 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -34,7 +34,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
api("androidx.hilt:hilt-navigation:1.0.0")
diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle
index b169056..66c4a78 100644
--- a/hilt/hilt-navigation-compose/samples/build.gradle
+++ b/hilt/hilt-navigation-compose/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle
index 915aaa6..532249b 100644
--- a/lifecycle/lifecycle-runtime-compose/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
api projectOrArtifact(":lifecycle:lifecycle-runtime-ktx")
api("androidx.annotation:annotation-experimental:1.1.0")
api("androidx.compose.runtime:runtime:1.0.1")
diff --git a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
index 695b392..122cf219 100644
--- a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
}
diff --git a/lifecycle/lifecycle-runtime-compose/samples/build.gradle b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
index d83fce3..b5b06a4 100644
--- a/lifecycle/lifecycle-runtime-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
implementation(libs.kotlinStdlib)
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index 2066fe9b..9ca789e 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
api projectOrArtifact(":lifecycle:lifecycle-common-java8")
api projectOrArtifact(":lifecycle:lifecycle-viewmodel-ktx")
diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
index 1a3fda6..daaf090 100644
--- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
implementation(libs.kotlinStdlib)
}
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
index 972b1db..2d12179 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
implementation(libs.kotlinStdlib)
implementation projectOrArtifact(":lifecycle:lifecycle-common-java8")
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 1abfe0c..f26a72d 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation("androidx.compose.foundation:foundation-layout:1.0.1")
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
index 81bcf0b..28c3ce6 100644
--- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(projectOrArtifact(":compose:integration-tests:demos:common"))
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index a6a322b..bc199d1 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index 8a6a33b..c9fb87e 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -26,7 +26,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
api("androidx.compose.foundation:foundation:1.0.5")
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle
index 7e1b213..e34ca03 100644
--- a/paging/paging-compose/integration-tests/paging-demos/build.gradle
+++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -25,7 +25,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(projectOrArtifact(":compose:integration-tests:demos:common"))
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index d5b9c9f..fb0f929 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
diff --git a/text/text/build.gradle b/text/text/build.gradle
index 1fd3a06..231df11 100644
--- a/text/text/build.gradle
+++ b/text/text/build.gradle
@@ -56,6 +56,10 @@
legacyDisableKotlinStrictApiMode = true
}
+androidxCompose {
+ composeCompilerPluginEnabled = false
+}
+
android {
namespace "androidx.compose.ui.text.android"
}
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index ee14b1a..c845ab3 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -26,7 +26,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api("androidx.compose.foundation:foundation:1.2.0-rc01")
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index 8058766..e5cce243 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/wear/compose/compose-material/benchmark/build.gradle b/wear/compose/compose-material/benchmark/build.gradle
index 8416175..3a552ea 100644
--- a/wear/compose/compose-material/benchmark/build.gradle
+++ b/wear/compose/compose-material/benchmark/build.gradle
@@ -33,7 +33,6 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation project(":compose:runtime:runtime")
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index b5af3bc..f8d1888 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -27,7 +27,6 @@
AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api("androidx.compose.foundation:foundation:1.2.0-rc01")
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index a46003b..f841dbb 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle
index 0f31ae4..a9f19c3 100644
--- a/wear/compose/compose-navigation/build.gradle
+++ b/wear/compose/compose-navigation/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
api("androidx.compose.ui:ui:1.2.0-rc01")
api("androidx.compose.runtime:runtime:1.2.0-rc01")
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index aa5cb3d..5503956 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -24,7 +24,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
diff --git a/wear/compose/integration-tests/demos/build.gradle b/wear/compose/integration-tests/demos/build.gradle
index fa5ce9d..8079cda 100644
--- a/wear/compose/integration-tests/demos/build.gradle
+++ b/wear/compose/integration-tests/demos/build.gradle
@@ -47,7 +47,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation("androidx.wear:wear:1.1.0")
diff --git a/wear/compose/integration-tests/macrobenchmark-target/build.gradle b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
index ecdab5f..f5c9d71e 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -34,7 +34,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation(libs.kotlinStdlib)
implementation(project(":compose:foundation:foundation-layout"))
diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle
index aeaf7f5..245f2a7 100644
--- a/wear/compose/integration-tests/navigation/build.gradle
+++ b/wear/compose/integration-tests/navigation/build.gradle
@@ -43,7 +43,6 @@
}
dependencies {
- kotlinPlugin(project(":compose:compiler:compiler"))
implementation("androidx.activity:activity-compose:1.3.1")
implementation(project(":compose:ui:ui"))