diff --git a/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt b/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt index f7d176f9..3730a056 100644 --- a/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt +++ b/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt @@ -74,8 +74,6 @@ import com.android.build.gradle.internal.packaging.getDefaultDebugKeystoreSignin import com.android.build.gradle.internal.profile.AnalyticsService import com.android.build.gradle.internal.publishing.AarOrJarTypeToConsume import com.android.build.gradle.internal.publishing.AndroidArtifacts -import com.android.build.gradle.internal.res.namespaced.AutoNamespacePreProcessTransform -import com.android.build.gradle.internal.res.namespaced.AutoNamespaceTransform import com.android.build.gradle.internal.scope.InternalArtifactType import com.android.build.gradle.internal.services.AndroidLocationsBuildService import com.android.build.gradle.internal.services.ProjectServices @@ -155,22 +153,14 @@ class DependencyConfigurator( } fun configureGeneralTransforms( - namespacedAndroidResources: Boolean, aarOrJarTypeToConsume: AarOrJarTypeToConsume ): DependencyConfigurator { val dependencies: DependencyHandler = project.dependencies val projectOptions = projectServices.projectOptions - // The aars/jars may need to be processed (e.g., jetified to AndroidX) before they can be - // used - val autoNamespaceDependencies = - namespacedAndroidResources && projectOptions[BooleanOption.CONVERT_NON_NAMESPACED_DEPENDENCIES] - val jetifiedAarOutputType = if (autoNamespaceDependencies) { - AndroidArtifacts.ArtifactType.MAYBE_NON_NAMESPACED_PROCESSED_AAR - } else { - AndroidArtifacts.ArtifactType.PROCESSED_AAR - } + val jetifiedAarOutputType = AndroidArtifacts.ArtifactType.PROCESSED_AAR + // Arguments passed to an ArtifactTransform must not be null val jetifierIgnoreList = projectOptions[StringOption.JETIFIER_IGNORE_LIST] ?: "" if (projectOptions.get(BooleanOption.ENABLE_JETIFIER)) { @@ -188,17 +178,10 @@ class DependencyConfigurator( ) { params -> params.ignoreListOption.setDisallowChanges(jetifierIgnoreList) } - } else if (autoNamespaceDependencies) { - // Namespaced resources code path is not optimized. Identity transforms are removed - // otherwise. + } else if (projectOptions[BooleanOption.ENABLE_IDENTITY_TRANSFORMS_FOR_PROCESSED_ARTIFACTS]) { + // These should not be needed in most scenarios now, but keeping the option for + // backwards compatibility. registerIdentityTransformWhenJetifierIsDisabled(jetifiedAarOutputType) - } else { - // Still register the transform if/when dagger plugin is applied - // TODO(b/288221106): Dagger plugin depends on our internal implementation, - // we need to eliminate their dependency on this to be able to remove the following. - project.plugins.withId("dagger.hilt.android.plugin") { - registerIdentityTransformWhenJetifierIsDisabled(jetifiedAarOutputType) - } } registerTransform( @@ -281,6 +264,9 @@ class DependencyConfigurator( spec.parameters.projectName.setDisallowChanges(project.name) spec.parameters.targetType.setDisallowChanges(transformTarget) spec.parameters.namespacedSharedLibSupport.setDisallowChanges(namespacedSharedLibSupport) + spec.parameters.filterOutGlobalRules.setDisallowChanges( + projectOptions[BooleanOption.R8_GLOBAL_OPTIONS_IN_CONSUMER_RULES_DISALLOWED] + ) } } if (projectOptions[BooleanOption.PRECOMPILE_DEPENDENCIES_RESOURCES]) { @@ -353,37 +339,19 @@ class DependencyConfigurator( ExtractProGuardRulesTransform::class.java, aarOrJarTypeToConsume.jar, AndroidArtifacts.ArtifactType.UNFILTERED_PROGUARD_RULES - ) + ) { params -> + params.filterOutGlobalRules.set( + projectServices.projectOptions.get( + BooleanOption.R8_GLOBAL_OPTIONS_IN_CONSUMER_RULES_DISALLOWED + ) + ) + } } registerTransform( LibrarySymbolTableTransform::class.java, AndroidArtifacts.ArtifactType.EXPLODED_AAR, AndroidArtifacts.ArtifactType.SYMBOL_LIST_WITH_PACKAGE_NAME ) - if (autoNamespaceDependencies) { - registerTransform( - AutoNamespacePreProcessTransform::class.java, - AndroidArtifacts.ArtifactType.MAYBE_NON_NAMESPACED_PROCESSED_AAR, - AndroidArtifacts.ArtifactType.PREPROCESSED_AAR_FOR_AUTO_NAMESPACE - ) { params -> - projectServices.initializeAapt2Input(params.aapt2, task = null) - } - registerTransform( - AutoNamespacePreProcessTransform::class.java, - AndroidArtifacts.ArtifactType.JAR, - AndroidArtifacts.ArtifactType.PREPROCESSED_AAR_FOR_AUTO_NAMESPACE - ) { params -> - projectServices.initializeAapt2Input(params.aapt2, task = null) - } - - registerTransform( - AutoNamespaceTransform::class.java, - AndroidArtifacts.ArtifactType.PREPROCESSED_AAR_FOR_AUTO_NAMESPACE, - AndroidArtifacts.ArtifactType.PROCESSED_AAR - ) { params -> - projectServices.initializeAapt2Input(params.aapt2, task = null) - } - } // Transform to go from external jars to CLASSES and JAVA_RES artifacts. This returns the // same exact file but with different types, since a jar file can contain both. for (classesOrResources in arrayOf( diff --git a/build.gradle b/build.gradle index c5e5bc38..2f7e21d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.jvm) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.publish) alias(libs.plugins.spotless) alias(libs.plugins.wire) apply false diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index 06ae2411..581372d4 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -1,4 +1,4 @@ -import com.google.devtools.ksp.gradle.KspTaskJvm +import com.google.devtools.ksp.gradle.KspAATask import com.squareup.wire.gradle.WireTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -72,7 +72,7 @@ val KOTLIN_VERSION = "${libs.versions.kotlin.get()}" } tasks.withType(KotlinCompile).configureEach { dependsOn(pluginVersion) } -tasks.withType(KspTaskJvm).configureEach { dependsOn(pluginVersion) } +tasks.withType(KspAATask).configureEach { dependsOn(pluginVersion) } wire { kotlin {} @@ -80,7 +80,7 @@ wire { // https://github.com/square/wire/issues/2335 afterEvaluate { - tasks.withType(KspTaskJvm).configureEach { - dependsOn(tasks.withType(WireTask)) - } + tasks.withType(KspAATask).configureEach { + dependsOn(tasks.withType(WireTask)) + } } diff --git a/gradle-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt b/gradle-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt index 384a69f2..a5dfb992 100644 --- a/gradle-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt +++ b/gradle-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt @@ -35,8 +35,7 @@ import com.android.build.api.variant.Variant import com.android.build.gradle.internal.publishing.AndroidArtifacts import com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask import com.android.build.gradle.internal.tasks.factory.dependsOn -import com.google.devtools.ksp.gradle.KspTask -import com.google.devtools.ksp.gradle.KspTaskJvm +import com.google.devtools.ksp.gradle.KspAATask import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.ArtifactCollection @@ -374,7 +373,7 @@ class BetterDynamicFeaturesPlugin : Plugin { artifact.type = ARTIFACT_TYPE_FEATURE_IMPLEMENTATION_REPORT // TODO: Try and do this lazily - tasks.withType(KspTaskJvm::class.java) { task -> + tasks.withType(KspAATask::class.java) { task -> if (!kspTaskMatchesVariant(task, androidVariant)) return@withType logger.debug("Configuring KSP task ${task.path} for variant ${androidVariant.name}") @@ -485,7 +484,7 @@ class BetterDynamicFeaturesPlugin : Plugin { } } - private fun kspTaskMatchesVariant(task: KspTask, variant: Variant): Boolean { + private fun kspTaskMatchesVariant(task: KspAATask, variant: Variant): Boolean { return task.name.contains(variant.name, ignoreCase = true) && !task.name.contains("UnitTest", ignoreCase = true) } diff --git a/gradle-plugin/src/test/fixtures/buildscript.gradle b/gradle-plugin/src/test/fixtures/buildscript.gradle index 7c2511ce..80a33958 100644 --- a/gradle-plugin/src/test/fixtures/buildscript.gradle +++ b/gradle-plugin/src/test/fixtures/buildscript.gradle @@ -12,8 +12,6 @@ project.buildscript.dependencies { } subprojects { - extensions.findByName("kotlin")?.jvmToolchain(17) - pluginManager.withPlugin("com.android.application") { android.compileOptions { sourceCompatibility(JavaVersion.VERSION_17) diff --git a/gradle-plugin/src/test/fixtures/codegen-fixture/base/build.gradle b/gradle-plugin/src/test/fixtures/codegen-fixture/base/build.gradle index 1aad5ec3..9f15c530 100644 --- a/gradle-plugin/src/test/fixtures/codegen-fixture/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/codegen-fixture/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { versionCode 1 diff --git a/gradle-plugin/src/test/fixtures/codegen-fixture/feature/build.gradle b/gradle-plugin/src/test/fixtures/codegen-fixture/feature/build.gradle index d5651aab..25c56e25 100644 --- a/gradle-plugin/src/test/fixtures/codegen-fixture/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/codegen-fixture/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk 24 diff --git a/gradle-plugin/src/test/fixtures/custom-build-type/base/build.gradle b/gradle-plugin/src/test/fixtures/custom-build-type/base/build.gradle index e1e9f647..a816d525 100644 --- a/gradle-plugin/src/test/fixtures/custom-build-type/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/custom-build-type/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 diff --git a/gradle-plugin/src/test/fixtures/custom-build-type/feature/build.gradle b/gradle-plugin/src/test/fixtures/custom-build-type/feature/build.gradle index 0ff8590f..ea818968 100644 --- a/gradle-plugin/src/test/fixtures/custom-build-type/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/custom-build-type/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/custom-lockfile/base/build.gradle b/gradle-plugin/src/test/fixtures/custom-lockfile/base/build.gradle index e290ef4a..f0651990 100644 --- a/gradle-plugin/src/test/fixtures/custom-lockfile/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/custom-lockfile/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/custom-lockfile/feature/build.gradle b/gradle-plugin/src/test/fixtures/custom-lockfile/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/custom-lockfile/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/custom-lockfile/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/different-versions-in-base/base/build.gradle b/gradle-plugin/src/test/fixtures/different-versions-in-base/base/build.gradle index 43dbadd8..1c7ebfc0 100644 --- a/gradle-plugin/src/test/fixtures/different-versions-in-base/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/different-versions-in-base/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/different-versions-in-base/feature/build.gradle b/gradle-plugin/src/test/fixtures/different-versions-in-base/feature/build.gradle index bc79273f..0c8c692a 100644 --- a/gradle-plugin/src/test/fixtures/different-versions-in-base/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/different-versions-in-base/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/different-versions/base/build.gradle b/gradle-plugin/src/test/fixtures/different-versions/base/build.gradle index a883efc8..63fca389 100644 --- a/gradle-plugin/src/test/fixtures/different-versions/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/different-versions/base/build.gradle @@ -1,11 +1,10 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/different-versions/feature/build.gradle b/gradle-plugin/src/test/fixtures/different-versions/feature/build.gradle index 828e39d4..df2cecb6 100644 --- a/gradle-plugin/src/test/fixtures/different-versions/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/different-versions/feature/build.gradle @@ -1,11 +1,10 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/feature-compile-classpath/base/build.gradle b/gradle-plugin/src/test/fixtures/feature-compile-classpath/base/build.gradle index 81df31a2..2c0b67df 100644 --- a/gradle-plugin/src/test/fixtures/feature-compile-classpath/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/feature-compile-classpath/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/feature-compile-classpath/feature/build.gradle b/gradle-plugin/src/test/fixtures/feature-compile-classpath/feature/build.gradle index 569accdf..8146c643 100644 --- a/gradle-plugin/src/test/fixtures/feature-compile-classpath/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/feature-compile-classpath/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/has-constraints/base/build.gradle b/gradle-plugin/src/test/fixtures/has-constraints/base/build.gradle index 09714c95..7917ab22 100644 --- a/gradle-plugin/src/test/fixtures/has-constraints/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/has-constraints/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/has-constraints/feature/build.gradle b/gradle-plugin/src/test/fixtures/has-constraints/feature/build.gradle index 50b78ca5..3e99981c 100644 --- a/gradle-plugin/src/test/fixtures/has-constraints/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/has-constraints/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/lockfile-activation/base/build.gradle b/gradle-plugin/src/test/fixtures/lockfile-activation/base/build.gradle index 4a9f9ca2..0b41b248 100644 --- a/gradle-plugin/src/test/fixtures/lockfile-activation/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/lockfile-activation/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/lockfile-activation/feature/build.gradle b/gradle-plugin/src/test/fixtures/lockfile-activation/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/lockfile-activation/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/lockfile-activation/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle b/gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle index c91348c4..592a4842 100644 --- a/gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' apply plugin: 'app.cash.better.dynamic.features.agp-patch' @@ -7,7 +6,7 @@ apply plugin: 'app.cash.better.dynamic.features.agp-patch' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 diff --git a/gradle-plugin/src/test/fixtures/missing-dex/base/gradle.lockfile b/gradle-plugin/src/test/fixtures/missing-dex/base/gradle.lockfile index 09a56a24..1bfeb720 100644 --- a/gradle-plugin/src/test/fixtures/missing-dex/base/gradle.lockfile +++ b/gradle-plugin/src/test/fixtures/missing-dex/base/gradle.lockfile @@ -25,10 +25,10 @@ com.google.android.play:feature-delivery-ktx:2.1.0=debugCompileClasspath,debugRu com.google.android.play:feature-delivery:2.1.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath com.squareup.okhttp3:okhttp:5.0.0-alpha.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath com.squareup.okio:okio:2.9.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.2.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath diff --git a/gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle b/gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle index 446df1a4..790bcb0a 100644 --- a/gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/multiplatform-dependency/base/build.gradle b/gradle-plugin/src/test/fixtures/multiplatform-dependency/base/build.gradle index 7eadbad4..b31d71a5 100644 --- a/gradle-plugin/src/test/fixtures/multiplatform-dependency/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/multiplatform-dependency/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/multiplatform-dependency/feature/build.gradle b/gradle-plugin/src/test/fixtures/multiplatform-dependency/feature/build.gradle index fe1b7a2b..7c0907bb 100644 --- a/gradle-plugin/src/test/fixtures/multiplatform-dependency/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/multiplatform-dependency/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/new-transitive-dependency/base/build.gradle b/gradle-plugin/src/test/fixtures/new-transitive-dependency/base/build.gradle index 2a0d973e..937cd437 100644 --- a/gradle-plugin/src/test/fixtures/new-transitive-dependency/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/new-transitive-dependency/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/new-transitive-dependency/feature/build.gradle b/gradle-plugin/src/test/fixtures/new-transitive-dependency/feature/build.gradle index 3c037051..f5421af6 100644 --- a/gradle-plugin/src/test/fixtures/new-transitive-dependency/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/new-transitive-dependency/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/out-of-date/base/build.gradle b/gradle-plugin/src/test/fixtures/out-of-date/base/build.gradle index 4a9f9ca2..0b41b248 100644 --- a/gradle-plugin/src/test/fixtures/out-of-date/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/out-of-date/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/out-of-date/feature/build.gradle b/gradle-plugin/src/test/fixtures/out-of-date/feature/build.gradle index 1e67e2c8..3da96a18 100644 --- a/gradle-plugin/src/test/fixtures/out-of-date/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/out-of-date/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/project-dependency/base/build.gradle b/gradle-plugin/src/test/fixtures/project-dependency/base/build.gradle index e6fb9989..b8fd7ded 100644 --- a/gradle-plugin/src/test/fixtures/project-dependency/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/project-dependency/base/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/project-dependency/feature/build.gradle b/gradle-plugin/src/test/fixtures/project-dependency/feature/build.gradle index f243b643..83615528 100644 --- a/gradle-plugin/src/test/fixtures/project-dependency/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/project-dependency/feature/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-correct-declaration/base/build.gradle b/gradle-plugin/src/test/fixtures/resources-correct-declaration/base/build.gradle index 9a705b67..9bfff37d 100644 --- a/gradle-plugin/src/test/fixtures/resources-correct-declaration/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-correct-declaration/base/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/resources-correct-declaration/feature/build.gradle b/gradle-plugin/src/test/fixtures/resources-correct-declaration/feature/build.gradle index f243b643..83615528 100644 --- a/gradle-plugin/src/test/fixtures/resources-correct-declaration/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-correct-declaration/feature/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-in-base/base/build.gradle b/gradle-plugin/src/test/fixtures/resources-in-base/base/build.gradle index e8ffd2ef..68c32215 100644 --- a/gradle-plugin/src/test/fixtures/resources-in-base/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-in-base/base/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/resources-in-base/feature/build.gradle b/gradle-plugin/src/test/fixtures/resources-in-base/feature/build.gradle index f243b643..83615528 100644 --- a/gradle-plugin/src/test/fixtures/resources-in-base/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-in-base/feature/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-missing-declaration/base/build.gradle b/gradle-plugin/src/test/fixtures/resources-missing-declaration/base/build.gradle index b701e4f7..68c32215 100644 --- a/gradle-plugin/src/test/fixtures/resources-missing-declaration/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-missing-declaration/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/resources-missing-declaration/feature/build.gradle b/gradle-plugin/src/test/fixtures/resources-missing-declaration/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/resources-missing-declaration/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-missing-declaration/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-normal/base/build.gradle b/gradle-plugin/src/test/fixtures/resources-normal/base/build.gradle index 4f00546b..04f8a76f 100644 --- a/gradle-plugin/src/test/fixtures/resources-normal/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-normal/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/resources-normal/feature/build.gradle b/gradle-plugin/src/test/fixtures/resources-normal/feature/build.gradle index 0e425d7d..99b919a6 100644 --- a/gradle-plugin/src/test/fixtures/resources-normal/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-normal/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-normal/library/build.gradle b/gradle-plugin/src/test/fixtures/resources-normal/library/build.gradle index 5849d737..842748a5 100644 --- a/gradle-plugin/src/test/fixtures/resources-normal/library/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-normal/library/build.gradle @@ -3,5 +3,5 @@ apply plugin: "com.android.library" android { namespace "app.cash.better.dynamic.features.integration.library" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } diff --git a/gradle-plugin/src/test/fixtures/resources-overwriting/base/build.gradle b/gradle-plugin/src/test/fixtures/resources-overwriting/base/build.gradle index 61a89df1..e97bd080 100644 --- a/gradle-plugin/src/test/fixtures/resources-overwriting/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-overwriting/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int defaultConfig { minSdk = 24 } diff --git a/gradle-plugin/src/test/fixtures/resources-overwriting/feature/build.gradle b/gradle-plugin/src/test/fixtures/resources-overwriting/feature/build.gradle index 0e425d7d..99b919a6 100644 --- a/gradle-plugin/src/test/fixtures/resources-overwriting/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-overwriting/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/resources-overwriting/library/build.gradle b/gradle-plugin/src/test/fixtures/resources-overwriting/library/build.gradle index 5849d737..842748a5 100644 --- a/gradle-plugin/src/test/fixtures/resources-overwriting/library/build.gradle +++ b/gradle-plugin/src/test/fixtures/resources-overwriting/library/build.gradle @@ -3,5 +3,5 @@ apply plugin: "com.android.library" android { namespace "app.cash.better.dynamic.features.integration.library" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } diff --git a/gradle-plugin/src/test/fixtures/same-versions/base/build.gradle b/gradle-plugin/src/test/fixtures/same-versions/base/build.gradle index a883efc8..63fca389 100644 --- a/gradle-plugin/src/test/fixtures/same-versions/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/same-versions/base/build.gradle @@ -1,11 +1,10 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/same-versions/feature/build.gradle b/gradle-plugin/src/test/fixtures/same-versions/feature/build.gradle index 5e285767..d45c663a 100644 --- a/gradle-plugin/src/test/fixtures/same-versions/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/same-versions/feature/build.gradle @@ -1,11 +1,10 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/base/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/base/build.gradle index 4049a1ca..b8fd7ded 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/feature/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/library/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/library/build.gradle index 0369fbd8..fcf9a349 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/library/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base-variant-aware/library/build.gradle @@ -1,10 +1,9 @@ apply plugin: 'com.android.library' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace "app.cash.better.dynamic.features.integration.library" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/base/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/base/build.gradle index e6fb9989..b8fd7ded 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/base/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/feature/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency-on-base/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency/base/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency/base/build.gradle index 4a9f9ca2..0b41b248 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/transitive-dependency/feature/build.gradle b/gradle-plugin/src/test/fixtures/transitive-dependency/feature/build.gradle index 917e4eea..adfd00bd 100644 --- a/gradle-plugin/src/test/fixtures/transitive-dependency/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/transitive-dependency/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/up-to-date/base/build.gradle b/gradle-plugin/src/test/fixtures/up-to-date/base/build.gradle index 4a9f9ca2..0b41b248 100644 --- a/gradle-plugin/src/test/fixtures/up-to-date/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/up-to-date/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/up-to-date/feature/build.gradle b/gradle-plugin/src/test/fixtures/up-to-date/feature/build.gradle index 1e67e2c8..3da96a18 100644 --- a/gradle-plugin/src/test/fixtures/up-to-date/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/up-to-date/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/variant-aware/base/build.gradle b/gradle-plugin/src/test/fixtures/variant-aware/base/build.gradle index 3acad7e8..58b4ef9f 100644 --- a/gradle-plugin/src/test/fixtures/variant-aware/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/variant-aware/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/variant-aware/feature/build.gradle b/gradle-plugin/src/test/fixtures/variant-aware/feature/build.gradle index f6bdcf38..6d976864 100644 --- a/gradle-plugin/src/test/fixtures/variant-aware/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/variant-aware/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle-plugin/src/test/fixtures/version-update/base/build.gradle b/gradle-plugin/src/test/fixtures/version-update/base/build.gradle index 4a9f9ca2..0b41b248 100644 --- a/gradle-plugin/src/test/fixtures/version-update/base/build.gradle +++ b/gradle-plugin/src/test/fixtures/version-update/base/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int dynamicFeatures = [':feature'] } diff --git a/gradle-plugin/src/test/fixtures/version-update/feature/build.gradle b/gradle-plugin/src/test/fixtures/version-update/feature/build.gradle index b1224054..83615528 100644 --- a/gradle-plugin/src/test/fixtures/version-update/feature/build.gradle +++ b/gradle-plugin/src/test/fixtures/version-update/feature/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.dynamic-feature' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.devtools.ksp' apply plugin: 'app.cash.better.dynamic.features' android { namespace "app.cash.better.dynamic.features.integration.feature" - compileSdk 32 + compileSdk libs.versions.compileSdk.get() as int } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 57a7b99b..f13bbb3b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -agp = "8.13.0" # keep in sync with android-tools -android-tools = "31.13.0" # = 23.0.0 + agp +agp = "9.0.0-alpha14" # keep in sync with android-tools +android-tools = "32.0.0-alpha14" # = 23.0.0 + agp compilerTesting = "0.7.1" -kotlin = "2.1.20" +kotlin = "2.2.20" kotlinPoet = "1.13.1" -ksp = "2.1.20-1.0.32" +ksp = "2.3.2" ktlint = "1.7.1" moshi = "1.15.2" @@ -51,8 +51,6 @@ android-application = { id = "com.android.application", version.ref = "agp" } android-dynamic-feature = { id = "com.android.dynamic-feature", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" } spotless = { id = "com.diffplug.spotless", version = "8.0.0" } diff --git a/runtime/build.gradle b/runtime/build.gradle index 9dd6538a..2d3d0dc0 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -1,9 +1,5 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.publish) alias(libs.plugins.spotless) } @@ -26,12 +22,6 @@ kotlin { jvmToolchain(17) } -tasks.withType(KotlinCompile).configureEach { task -> - task.compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) - } -} - dependencies { api libs.featureDelivery api projects.runtime.jvm diff --git a/sample/app/build.gradle b/sample/app/build.gradle index b90c6e15..c439f25e 100644 --- a/sample/app/build.gradle +++ b/sample/app/build.gradle @@ -1,9 +1,7 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.betterDynamicFeatures) - alias(libs.plugins.compose.compiler) } android { diff --git a/sample/bigboxfeature/api/build.gradle b/sample/bigboxfeature/api/build.gradle index 20bb4e68..809a685f 100644 --- a/sample/bigboxfeature/api/build.gradle +++ b/sample/bigboxfeature/api/build.gradle @@ -1,9 +1,7 @@ plugins { alias(libs.plugins.android.dynamic.feature) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.betterDynamicFeatures) - alias(libs.plugins.compose.compiler) } android { diff --git a/sample/bigboxfeature/build.gradle b/sample/bigboxfeature/build.gradle index 367d064f..74980cb3 100644 --- a/sample/bigboxfeature/build.gradle +++ b/sample/bigboxfeature/build.gradle @@ -1,9 +1,7 @@ plugins { alias(libs.plugins.android.dynamic.feature) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.betterDynamicFeatures) - alias(libs.plugins.compose.compiler) } android { diff --git a/sample/build.gradle b/sample/build.gradle index 51f129ab..0c7fe2f9 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,15 +2,9 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.android.dynamic.feature) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.compose.compiler) apply false } subprojects { - pluginManager.withPlugin("org.jetbrains.kotlin.android") { - kotlin.jvmToolchain(17) - } - pluginManager.withPlugin("com.android.application") { android.compileOptions { sourceCompatibility(JavaVersion.VERSION_17) diff --git a/sample/extrabigboxfeature/build.gradle b/sample/extrabigboxfeature/build.gradle index 550e3719..491147fb 100644 --- a/sample/extrabigboxfeature/build.gradle +++ b/sample/extrabigboxfeature/build.gradle @@ -1,9 +1,7 @@ plugins { alias(libs.plugins.android.dynamic.feature) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.betterDynamicFeatures) - alias(libs.plugins.compose.compiler) } android { diff --git a/sample/smallboxfeature/build.gradle b/sample/smallboxfeature/build.gradle index ac990415..b9f0c4b9 100644 --- a/sample/smallboxfeature/build.gradle +++ b/sample/smallboxfeature/build.gradle @@ -1,9 +1,7 @@ plugins { alias(libs.plugins.android.dynamic.feature) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.betterDynamicFeatures) - alias(libs.plugins.compose.compiler) } android {