Moves useIR configuration to AndroidXUiPlugin
Every Compose project should use this flag, so it is just easier to centralize the configuration
Test: demo app
Change-Id: I83bd4f90bd878a56e962d22a830e9264d2659a87
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
index 600632c..11cf0a0 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
@@ -28,7 +28,6 @@
import org.gradle.api.tasks.ClasspathNormalizer
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.findByType
-import org.gradle.kotlin.dsl.invoke
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -68,9 +67,9 @@
}.files
project.tasks.withType(KotlinCompile::class.java).configureEach { compile ->
+ compile.kotlinOptions.useIR = true
// TODO(b/157230235): remove when this is enabled by default
- compile.kotlinOptions.freeCompilerArgs +=
- "-Xopt-in=kotlin.RequiresOptIn"
+ compile.kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
compile.inputs.files(kotlinPlugin)
.withPropertyName("composeCompilerExtension")
.withNormalizer(ClasspathNormalizer::class.java)
diff --git a/compose/androidview/androidview/build.gradle b/compose/androidview/androidview/build.gradle
index 4a957f6..2e9e316 100644
--- a/compose/androidview/androidview/build.gradle
+++ b/compose/androidview/androidview/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -50,14 +49,6 @@
androidTestImplementation(ESPRESSO_CORE)
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose View Wrappers"
publish = Publish.NONE
diff --git a/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle b/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle
index 7e37835..f8556f7 100644
--- a/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle
+++ b/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -38,11 +36,3 @@
implementation project(":compose:ui:ui")
implementation "androidx.fragment:fragment-ktx:1.2.5"
}
-
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 781604b3..7e1f35a 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -124,14 +124,3 @@
]
}
}
-
-android {
- defaultConfig {
- minSdkVersion 21
- }
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index 1a57854..71dacb6 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -41,13 +39,6 @@
implementation project(':compose:material:material')
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
-
androidx {
name = "AndroidX Compose UI Animation Library Core Classes Samples"
type = LibraryType.SAMPLES
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index d45697a1..4b5cb0d 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -17,9 +17,7 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -113,9 +111,3 @@
description = "Compose animation library"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle
index feac8d4..898109d 100644
--- a/compose/animation/animation/integration-tests/animation-demos/build.gradle
+++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -25,9 +23,3 @@
implementation project(':compose:foundation:foundation')
implementation project(':compose:material:material')
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 58d3b8c..66c6546 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -42,14 +40,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Animation Library Samples"
type = LibraryType.SAMPLES
diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle
index 328931fc..ecd11cf 100644
--- a/compose/desktop/desktop/build.gradle
+++ b/compose/desktop/desktop/build.gradle
@@ -19,7 +19,6 @@
import androidx.build.Publish
import androidx.build.RunApiTasks
import androidx.build.SupportConfigKt
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.AndroidXPlugin.BUILD_ON_SERVER_TASK
import static androidx.build.dependencies.DependenciesKt.*
@@ -72,12 +71,6 @@
systemProperties['GOLDEN_PATH'] = project.rootDir.absolutePath + "/../../golden"
}
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
-
androidx {
name = "Jetpack Compose desktop implementation"
publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle
index f81a739..3e0e213 100644
--- a/compose/desktop/desktop/samples/build.gradle
+++ b/compose/desktop/desktop/samples/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import androidx.build.SupportConfigKt
import static androidx.build.AndroidXPlugin.BUILD_ON_SERVER_TASK
@@ -47,12 +45,6 @@
}
}
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
-
task run1(type: JavaExec) {
dependsOn(":compose:desktop:desktop:jar")
main = 'androidx.compose.desktop.examples.example1.MainKt'
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index af73d79..c5d8811 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -17,9 +17,7 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -115,9 +113,3 @@
description = "Compose layout implementations"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
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 9928c7da..a278c67 100644
--- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
+++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -39,11 +37,3 @@
implementation project(":compose:ui:ui")
implementation project(":compose:ui:ui-text")
}
-
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle
index fbfbca1..df9319f 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -42,14 +40,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Core Layout Classes Samples"
type = LibraryType.SAMPLES
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index a3479cb..48d90dc 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -166,7 +165,6 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
- useIR = true
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
}
}
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
index ea627069..6424d46 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -42,11 +40,3 @@
implementation project(":compose:ui:ui-text:ui-text-samples")
implementation project(":paging:paging-compose:integration-tests:paging-demos")
}
-
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index cc60a60..0c2ff60 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -44,14 +42,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Foundational Component Samples"
type = LibraryType.SAMPLES
diff --git a/compose/integration-tests/benchmark/build.gradle b/compose/integration-tests/benchmark/build.gradle
index 65b7d93..0dba95f 100644
--- a/compose/integration-tests/benchmark/build.gradle
+++ b/compose/integration-tests/benchmark/build.gradle
@@ -14,11 +14,7 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -63,9 +59,3 @@
}
android.defaultConfig.minSdkVersion 21
-
-tasks.withType(KotlinCompile).all {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/integration-tests/build.gradle b/compose/integration-tests/build.gradle
index 31a169d..967d4bb 100644
--- a/compose/integration-tests/build.gradle
+++ b/compose/integration-tests/build.gradle
@@ -14,12 +14,7 @@
* limitations under the License.
*/
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -55,9 +50,3 @@
}
android.defaultConfig.minSdkVersion 21
-
-tasks.withType(KotlinCompile).all {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index e422582..1e30f71 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -51,9 +49,3 @@
archivesBaseName = "compose-demos-testapp"
}
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index e72eb74..5a84aeb 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -32,9 +30,3 @@
api "androidx.activity:activity:1.2.0-alpha02"
implementation projectOrArtifact(":compose:runtime:runtime")
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index 3b400dd..41ac25a 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -57,9 +56,3 @@
android.defaultConfig.minSdkVersion 21
android.buildFeatures.viewBinding true
-
-tasks.withType(KotlinCompile).all {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 666cb1c..1c20b04 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -31,9 +29,3 @@
}
android.defaultConfig.minSdkVersion 21
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle
index 50a9605..398b65f 100644
--- a/compose/material/material-icons-core/samples/build.gradle
+++ b/compose/material/material-icons-core/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -40,14 +38,6 @@
implementation project(":compose:runtime:runtime")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Core Material Icons Samples"
type = LibraryType.SAMPLES
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index 9f6660c..c8ab1c9 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -16,11 +16,9 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
import androidx.compose.material.icons.generator.tasks.IconGenerationTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -121,9 +119,3 @@
inceptionYear = "2020"
description = "Compose Material Design extended icons. This module contains all Material icons. It is a very large dependency and should not be included directly."
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle
index 296fd0d..7c7d624 100644
--- a/compose/material/material-ripple/build.gradle
+++ b/compose/material/material-ripple/build.gradle
@@ -94,12 +94,6 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
- useIR = true
- }
-}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
freeCompilerArgs += ["-Xallow-jvm-ir-dependencies"]
}
}
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 96b2108..ab9a9b22 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
import androidx.build.Publish
@@ -139,12 +138,6 @@
legacyDisableKotlinStrictApiMode = true
}
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
-
// Screenshot tests related setup
android {
sourceSets.androidTest.assets.srcDirs +=
diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle
index 6771f58..ee5ffdc 100644
--- a/compose/material/material/integration-tests/material-demos/build.gradle
+++ b/compose/material/material/integration-tests/material-demos/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.Publish
@@ -25,14 +23,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Material Demos"
publish = Publish.NONE
diff --git a/compose/material/material/integration-tests/material-studies/build.gradle b/compose/material/material/integration-tests/material-studies/build.gradle
index e688a05..64e63e5 100644
--- a/compose/material/material/integration-tests/material-studies/build.gradle
+++ b/compose/material/material/integration-tests/material-studies/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -39,11 +37,3 @@
implementation project(":compose:ui:ui-text")
implementation project(':compose:material:material')
}
-
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle
index dcadaf0..20d75b7 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -44,14 +42,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Material Design Components Samples"
type = LibraryType.SAMPLES
diff --git a/compose/runtime/runtime-dispatch/build.gradle b/compose/runtime/runtime-dispatch/build.gradle
index f222d06..7694ed5 100644
--- a/compose/runtime/runtime-dispatch/build.gradle
+++ b/compose/runtime/runtime-dispatch/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -134,6 +133,5 @@
freeCompilerArgs += [
"-Xuse-experimental=kotlin.Experimental"
]
- useIR = true
}
}
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index cc8ca82..6dd364b 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -51,9 +49,3 @@
description = "Compose integration with LiveData"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle
index 130994c..a1eaf1c 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -38,14 +36,6 @@
implementation project(":compose:runtime:runtime-livedata")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Livedata Interop Samples"
type = LibraryType.SAMPLES
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 9177fab..211d2d6 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -50,9 +48,3 @@
description = "Compose integration with RxJava 2"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle
index 8c30da7..0870f6f 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -38,14 +36,6 @@
implementation project(":compose:runtime:runtime-rxjava2")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose RxJava 2 Integration Samples"
type = LibraryType.SAMPLES
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index bac7e5f..0e4ec3e 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -50,9 +48,3 @@
description = "Compose integration with RxJava 3"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle
index 1711449..2f648f3 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -38,14 +36,6 @@
implementation project(":compose:runtime:runtime-rxjava3")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose RxJava 3 Integration Samples"
type = LibraryType.SAMPLES
diff --git a/compose/runtime/runtime-saved-instance-state/build.gradle b/compose/runtime/runtime-saved-instance-state/build.gradle
index e40d6f8..b5e1307 100644
--- a/compose/runtime/runtime-saved-instance-state/build.gradle
+++ b/compose/runtime/runtime-saved-instance-state/build.gradle
@@ -17,9 +17,7 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -122,9 +120,3 @@
description = "Compose components that allow saving and restoring the local ui state"
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/runtime/runtime-saved-instance-state/samples/build.gradle b/compose/runtime/runtime-saved-instance-state/samples/build.gradle
index 85e0e6a..e20333d 100644
--- a/compose/runtime/runtime-saved-instance-state/samples/build.gradle
+++ b/compose/runtime/runtime-saved-instance-state/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -41,14 +39,6 @@
implementation project(":compose:runtime:runtime-saved-instance-state")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose Saved Instance State System Samples"
type = LibraryType.SAMPLES
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index ab49bf9..3bec43a 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-
import androidx.build.AndroidXUiPlugin
+import androidx.build.LibraryGroups
+import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.Publish
plugins {
id("AndroidXPlugin")
@@ -137,7 +135,6 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
- useIR = true
incremental = false
}
}
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
index 3fdd6c6..71ee0fc 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -65,9 +62,3 @@
androidTestImplementation(project(":benchmark:benchmark-junit4"))
androidTestImplementation "androidx.activity:activity:1.2.0-alpha02"
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle
index 4e5ab9d..229fbf1 100644
--- a/compose/runtime/runtime/integration-tests/build.gradle
+++ b/compose/runtime/runtime/integration-tests/build.gradle
@@ -98,7 +98,6 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
- useIR = true
incremental = false
}
}
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle
index a34f145..6b6f4f6 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -47,9 +45,3 @@
inceptionYear = "2019"
description = "Contains the sample code for the Compose runtime"
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index 2a4108a..804c95a 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -97,14 +96,6 @@
}
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Internal Test Utils"
publish = Publish.NONE
diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle
index 3b961bc..58c21d3 100644
--- a/compose/ui/ui-geometry/build.gradle
+++ b/compose/ui/ui-geometry/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -92,6 +91,5 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
- useIR = true
}
}
\ No newline at end of file
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle
index 21223a5..3443577 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -42,14 +40,6 @@
implementation project(":compose:ui:ui-util")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Graphics Components Samples"
type = LibraryType.SAMPLES
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index da98a1d..ce1907f 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -17,9 +17,7 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -120,14 +118,6 @@
}
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Testing for JUnit4"
publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index 3e55c2a..f33380b 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -17,9 +17,7 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -125,14 +123,6 @@
}
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Testing"
publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index a8f1082..6ad838b 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -172,7 +171,6 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
- useIR = true
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
}
}
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle
index 2f53245..97789d8 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -42,14 +40,6 @@
implementation project(":compose:ui:ui-text")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Text Core Samples"
type = LibraryType.SAMPLES
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index db472c3..97f9838 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -63,9 +61,3 @@
description = "Compose tooling library. This library exposes information to our tools for better IDE support."
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index 53e5c03..63c8cbd 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -110,6 +109,5 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
- useIR = true
}
}
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle
index 5fc2183..dfa93c3 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -40,14 +38,6 @@
implementation project(":compose:ui:ui-unit")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Simple Unit Classes Samples"
type = LibraryType.SAMPLES
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index 4dbda77..71439fe 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -98,6 +97,5 @@
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
- useIR = true
}
}
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index 87f0e1f..5912b16 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -50,18 +48,6 @@
legacyDisableKotlinStrictApiMode = true
}
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
-
-//android.buildTypes.all {
-// buildFeatures {
-// viewBinding true
-// }
-//}
-
android {
buildFeatures {
viewBinding true
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index 7108bb6..520a897 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -47,11 +45,6 @@
}
android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
buildFeatures {
viewBinding true
}
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 9047a95..952edf6 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.AndroidXUiPlugin
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -236,7 +235,6 @@
"-Xuse-experimental=kotlin.Experimental",
"-XXLanguage:+InlineClasses"
]
- useIR = true
}
}
diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle
index 9a5536b..8db147c 100644
--- a/compose/ui/ui/integration-tests/ui-demos/build.gradle
+++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
import static androidx.build.dependencies.DependenciesKt.*
plugins {
@@ -28,12 +26,6 @@
}
android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-
buildFeatures {
viewBinding true
}
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle
index fc02f66..936f1b7 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -15,9 +15,7 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.LibraryType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -41,14 +39,6 @@
implementation project(":compose:ui:ui")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Core Classes Samples"
type = LibraryType.SAMPLES
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index cb028e2..274af7d 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -18,7 +18,6 @@
import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -59,9 +58,3 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
index bb1243d..7ba0cb8 100644
--- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
@@ -16,7 +16,6 @@
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
@@ -38,14 +37,6 @@
implementation projectOrArtifact(":navigation:navigation-compose:navigation-compose-samples")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Navigation Demos"
publish = Publish.NONE
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index caf0856..7da2e2b 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -18,7 +18,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.LibraryType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -39,14 +38,6 @@
implementation projectOrArtifact(":compose:material:material")
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "AndroidX Compose UI Navigation Integration Samples"
type = LibraryType.SAMPLES
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index ef5d031..fe08421 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -18,7 +18,6 @@
import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -54,9 +53,3 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
-
-tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
-}
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle
index 7991870..f2da6c4 100644
--- a/paging/paging-compose/integration-tests/paging-demos/build.gradle
+++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -16,7 +16,6 @@
import androidx.build.Publish
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
@@ -44,14 +43,6 @@
implementation "androidx.room:room-ktx:$room_version"
}
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
-
androidx {
name = "Compose Paging Demos"
publish = Publish.NONE
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index 3acd447..6226500 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -17,7 +17,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.LibraryType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
@@ -46,11 +45,3 @@
inceptionYear = "2020"
description = "Contains the sample code for the Androidx Paging library compose interop"
}
-
-android {
- tasks.withType(KotlinCompile).configureEach {
- kotlinOptions {
- useIR = true
- }
- }
-}
