Unifies dependencies across Compose and main project
Previously we split dependencies (such as Kotlin versions) in both
build_dependencies and Dependencies, and there were some dependencies
(Lint) that we didn't split, when we should. Havig two places where we
set these becomes really confusing, and hard to maintain. This CL splits
lint dependencies to match AGP version, and ensures that versions that
*can* change in Dependencies.kt always come from build_dependencies, as
the source of truth.
Test: ./gradlew bOS
Change-Id: I99f62beb99bfcda84076f2066765c1298fc416f1
diff --git a/benchmark/common/build.gradle b/benchmark/common/build.gradle
index 82964ad..7b3bb3d 100644
--- a/benchmark/common/build.gradle
+++ b/benchmark/common/build.gradle
@@ -35,7 +35,7 @@
androidTestImplementation(ANDROIDX_TEST_RULES)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(KOTLIN_TEST_COMMON)
+ androidTestImplementation(KOTLIN_TEST)
}
androidx {
diff --git a/benchmark/gradle-plugin/build.gradle b/benchmark/gradle-plugin/build.gradle
index 755ede5..284dfd1 100644
--- a/benchmark/gradle-plugin/build.gradle
+++ b/benchmark/gradle-plugin/build.gradle
@@ -41,13 +41,13 @@
dependencies {
implementation gradleApi()
- implementation(ANDROID_GRADLE_PLUGIN)
+ implementation(AGP_STABLE)
implementation(KOTLIN_STDLIB)
testImplementation gradleTestKit()
testImplementation(ANDROIDX_TEST_RUNNER)
testImplementation(JUNIT)
- testImplementation(KOTLIN_TEST_COMMON)
+ testImplementation(KOTLIN_TEST)
}
task generateSdkResource() {
diff --git a/buildSrc-tests/lint-checks/build.gradle b/buildSrc-tests/lint-checks/build.gradle
index 9e9f531..b89bc5c 100644
--- a/buildSrc-tests/lint-checks/build.gradle
+++ b/buildSrc-tests/lint-checks/build.gradle
@@ -19,18 +19,20 @@
import java.io.File
+import static androidx.build.dependencies.DependenciesKt.*
+
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- implementation build_libs.lint.core
- implementation build_libs.lint.api
- implementation build_libs.kotlin.stdlib
- testImplementation build_libs.lint.tests
- api("androidx.annotation:annotation:1.0.0")
- implementation project.files(new File(BuildServerConfigurationKt.getRootOutDirectory(project), "buildSrc/lint-checks/build/libs/lint-checks.jar"))
+ testImplementation LINT_CORE
+ testImplementation LINT_API_LATEST
+ testImplementation KOTLIN_STDLIB
+ testImplementation LINT_TESTS
+ testImplementation("androidx.annotation:annotation:1.0.0")
+ testImplementation project.files(new File(BuildServerConfigurationKt.getRootOutDirectory(project), "buildSrc/lint-checks/build/libs/lint-checks.jar"))
}
androidx {
diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle
index 2438006..8acd5ed 100644
--- a/buildSrc/build_dependencies.gradle
+++ b/buildSrc/build_dependencies.gradle
@@ -18,15 +18,17 @@
def build_versions = [:]
+// NOTE: lint versions *must* be kept in sync with agp
if (isUiProject) {
build_versions.kotlin = "1.3.60-eap-25"
build_versions.agp = "4.0.0-alpha01"
+ build_versions.lint = "27.0.0-alpha01"
} else {
build_versions.kotlin = "1.3.41"
build_versions.agp = "3.6.0-beta01"
+ build_versions.lint = "26.6.0-beta01"
}
-build_versions.lint = '26.6.0-beta01'
build_versions.dokka = '0.9.17-g002'
rootProject.ext['build_versions'] = build_versions
@@ -36,20 +38,20 @@
build_libs.agp = "com.android.tools.build:gradle:${build_versions.agp}"
build_libs.lint = [
- core: "com.android.tools.lint:lint:${build_versions.lint}",
- api: "com.android.tools.lint:lint-api:${build_versions.lint}",
- tests: "com.android.tools.lint:lint-tests:${build_versions.lint}"
+ core: "com.android.tools.lint:lint:${build_versions.lint}",
+ api: "com.android.tools.lint:lint-api:${build_versions.lint}",
+ tests: "com.android.tools.lint:lint-tests:${build_versions.lint}"
]
build_libs.error_prone_gradle = 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
build_libs.kotlin = [
- stdlib: "org.jetbrains.kotlin:kotlin-stdlib:${build_versions.kotlin}",
- gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${build_versions.kotlin}"
+ stdlib: "org.jetbrains.kotlin:kotlin-stdlib:${build_versions.kotlin}",
+ gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${build_versions.kotlin}"
]
build_libs.dex_member_list = "com.jakewharton.dex:dex-member-list:4.1.1"
build_libs.dokka_gradle = [
- "org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}",
- "org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}",
+ "org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}",
+ "org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}",
]
rootProject.ext['build_libs'] = build_libs
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index 27f551f..03cbf43 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -55,6 +55,7 @@
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.logging.configuration.ShowStacktrace
+import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.api.plugins.JavaPlugin
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.TaskProvider
@@ -258,7 +259,9 @@
}
private fun Project.configureRootProject() {
+ setDependencyVersions()
configureKtlintCheckFile()
+
if (isRunningOnBuildServer()) {
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS
}
@@ -875,3 +878,16 @@
}
}
}
+
+private fun Project.setDependencyVersions() {
+ val buildVersions = (project.rootProject.property("ext") as ExtraPropertiesExtension)
+ .let { it.get("build_versions") as Map<*, *> }
+
+ fun getVersion(key: String) = checkNotNull(buildVersions[key]) {
+ "Could not find a version for `$key`"
+ }.toString()
+
+ androidx.build.dependencies.kotlinVersion = getVersion("kotlin")
+ androidx.build.dependencies.agpVersion = getVersion("agp")
+ androidx.build.dependencies.lintVersion = getVersion("lint")
+}
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt b/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
index fc8b7eb..984edb8 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
@@ -80,12 +80,5 @@
}
@JvmStatic
- fun getAGPVersion(project: Project): String {
- val studioProperties = (project.rootProject.property("ext") as ExtraPropertiesExtension)
- .let { it.get("build_versions") as Map<*, *> }
- return studioProperties["agp"].toString()
- }
-
- @JvmStatic
fun isUiProject() = System.getenv("DIST_SUBDIR") == "/ui"
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index 0159c65..ed324cc 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -16,9 +16,6 @@
package androidx.build.dependencies
-import androidx.build.SupportConfig
-
-const val ANDROID_GRADLE_PLUGIN = "com.android.tools.build:gradle:3.4.2"
const val ANDROIDX_TEST_CORE = "androidx.test:core:1.2.0"
const val ANDROIDX_TEST_EXT_JUNIT = "androidx.test.ext:junit:1.1.1"
const val ANDROIDX_TEST_EXT_KTX = "androidx.test.ext:junit-ktx:1.1.1"
@@ -55,21 +52,12 @@
const val KOTLINPOET = "com.squareup:kotlinpoet:1.4.0"
const val KOTLIN_GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
-const val COMPOSE_VERSION = "1.3.60-eap-25"
-private val KOTLIN_VERSION = if (SupportConfig.isUiProject()) COMPOSE_VERSION else "1.3.50"
-val KOTLIN_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
-val KOTLIN_TEST_COMMON = "org.jetbrains.kotlin:kotlin-test:$KOTLIN_VERSION"
-const val KOTLIN_COMPOSE_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib:$COMPOSE_VERSION"
-const val KOTLIN_COMPOSE_REFLECT = "org.jetbrains.kotlin:kotlin-reflect:$COMPOSE_VERSION"
-
const val KOTLIN_METADATA = "me.eugeniomarletti.kotlin.metadata:kotlin-metadata:1.4.0"
const val KOTLIN_METADATA_JVM = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.0.5"
private const val KOTLIN_COROUTINES_VERSION = "1.3.0"
const val KOTLIN_COROUTINES_ANDROID =
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$KOTLIN_COROUTINES_VERSION"
-const val KOTLIN_COMPOSE_COROUTINES =
- "org.jetbrains.kotlinx:kotlinx-coroutines-android:$KOTLIN_COROUTINES_VERSION"
const val KOTLIN_COROUTINES_CORE =
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION"
const val KOTLIN_COROUTINES_GUAVA =
@@ -81,10 +69,6 @@
const val LEAKCANARY_INSTRUMENTATION =
"com.squareup.leakcanary:leakcanary-android-instrumentation:1.6.2"
-const val LINT_API_MIN = "com.android.tools.lint:lint-api:26.3.0"
-const val LINT_API_LATEST = "com.android.tools.lint:lint-api:26.6.0-beta01"
-const val LINT_CORE = "com.android.tools.lint:lint:26.6.0-beta01"
-const val LINT_TESTS = "com.android.tools.lint:lint-tests:26.6.0-beta01"
const val MATERIAL = "com.google.android.material:material:1.0.0"
const val MOCKITO_CORE = "org.mockito:mockito-core:2.19.0"
const val MOCKITO_KOTLIN = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
@@ -104,3 +88,26 @@
const val FLOGGER = "com.google.flogger:flogger:0.4"
const val FLOGGER_SYSTEM_BACKEND = "com.google.flogger:flogger-system-backend:0.4"
+
+// The following versions change depending on whether we are in the main or ui project - the
+// specific versions are configured in build_dependencies.gradle as they are needed during
+// buildSrc configuration. They are then set here in AndroidXPlugin when configuring the root
+// project.
+internal lateinit var kotlinVersion: String
+
+val KOTLIN_VERSION get() = kotlinVersion
+val KOTLIN_STDLIB get() = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+val KOTLIN_TEST get() = "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+val KOTLIN_REFLECT get() = "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+
+internal lateinit var agpVersion: String
+
+const val AGP_STABLE = "com.android.tools.build:gradle:3.4.2"
+val AGP_LATEST get() = "com.android.tools.build:gradle:$agpVersion"
+
+internal lateinit var lintVersion: String
+
+const val LINT_API_MIN = "com.android.tools.lint:lint-api:26.3.0"
+val LINT_API_LATEST get() = "com.android.tools.lint:lint-api:$lintVersion"
+val LINT_CORE get() = "com.android.tools.lint:lint:$lintVersion"
+val LINT_TESTS get() = "com.android.tools.lint:lint-tests:$lintVersion"
diff --git a/compose/compose-compiler-hosted/build.gradle b/compose/compose-compiler-hosted/build.gradle
index ee05699..8e75881 100644
--- a/compose/compose-compiler-hosted/build.gradle
+++ b/compose/compose-compiler-hosted/build.gradle
@@ -35,11 +35,11 @@
}
dependencies {
- compileOnly(KOTLIN_COMPOSE_STDLIB)
- compileOnly("org.jetbrains.kotlin:kotlin-compiler:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-plugin:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-intellij-core:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-platform-api:$COMPOSE_VERSION")
+ compileOnly(KOTLIN_STDLIB)
+ compileOnly("org.jetbrains.kotlin:kotlin-compiler:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-plugin:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-intellij-core:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-platform-api:$KOTLIN_VERSION")
}
tasks.withType(KotlinCompile).configureEach {
diff --git a/compose/compose-compiler-hosted/integration-tests/build.gradle b/compose/compose-compiler-hosted/integration-tests/build.gradle
index d4afe75..1c35ce2 100644
--- a/compose/compose-compiler-hosted/integration-tests/build.gradle
+++ b/compose/compose-compiler-hosted/integration-tests/build.gradle
@@ -29,13 +29,13 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
testImplementation(JUNIT)
testImplementation(ROBOLECTRIC)
- testImplementation("org.jetbrains.kotlin:kotlin-compiler:$COMPOSE_VERSION")
+ testImplementation("org.jetbrains.kotlin:kotlin-compiler:$KOTLIN_VERSION")
- testImplementation(KOTLIN_COMPOSE_STDLIB)
+ testImplementation(KOTLIN_STDLIB)
testImplementation(project(":compose:compose-runtime"))
testImplementation(project(":ui:ui-framework"))
testImplementation(project(":ui:ui-android-view-non-ir"))
diff --git a/compose/compose-ide-plugin/build.gradle b/compose/compose-ide-plugin/build.gradle
index a8c8b5f..4eb00cb 100644
--- a/compose/compose-ide-plugin/build.gradle
+++ b/compose/compose-ide-plugin/build.gradle
@@ -52,18 +52,18 @@
}
dependencies {
- compileOnly(KOTLIN_COMPOSE_STDLIB)
+ compileOnly(KOTLIN_STDLIB)
implementation project(":compose:compose-compiler-hosted")
- compileOnly("org.jetbrains.kotlin:kotlin-compiler:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-plugin:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-intellij-core:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-platform-api:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-platform-impl:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-j2k:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-java-impl:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-openapi:$COMPOSE_VERSION")
- compileOnly("org.jetbrains.kotlin:kotlin-jps-common-ide:$COMPOSE_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-compiler:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-plugin:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-intellij-core:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-platform-api:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-platform-impl:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-j2k:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-java-impl:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-openapi:$KOTLIN_VERSION")
+ compileOnly("org.jetbrains.kotlin:kotlin-jps-common-ide:$KOTLIN_VERSION")
// Intellij plugins have a bunch of implicit dependencies. The Gradle Intellij Plugin usually
// adds these automatically, but we are adding them explicitly here.
diff --git a/compose/compose-runtime/build.gradle b/compose/compose-runtime/build.gradle
index 7d496c9..fa9d11f 100644
--- a/compose/compose-runtime/build.gradle
+++ b/compose/compose-runtime/build.gradle
@@ -31,7 +31,7 @@
sourceSets {
commonMain.dependencies {
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
}
commonTest.dependencies {
implementation kotlin("test-junit")
diff --git a/compose/compose-runtime/compose-runtime-benchmark/build.gradle b/compose/compose-runtime/compose-runtime-benchmark/build.gradle
index dcb32f6..c04ad25 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/compose-runtime/compose-runtime-benchmark/build.gradle
@@ -61,8 +61,8 @@
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(KOTLIN_COMPOSE_STDLIB)
- androidTestImplementation(KOTLIN_COMPOSE_REFLECT)
+ androidTestImplementation(KOTLIN_STDLIB)
+ androidTestImplementation(KOTLIN_REFLECT)
androidTestImplementation(project(":benchmark:benchmark-junit4"))
}
diff --git a/compose/compose-runtime/integration-tests/samples/build.gradle b/compose/compose-runtime/integration-tests/samples/build.gradle
index 0f0590a..547e956 100644
--- a/compose/compose-runtime/integration-tests/samples/build.gradle
+++ b/compose/compose-runtime/integration-tests/samples/build.gradle
@@ -26,7 +26,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
implementation project(":compose:compose-runtime")
diff --git a/lifecycle/integration-tests/incrementality/build.gradle b/lifecycle/integration-tests/incrementality/build.gradle
index cd8e0b6..f85b722 100644
--- a/lifecycle/integration-tests/incrementality/build.gradle
+++ b/lifecycle/integration-tests/incrementality/build.gradle
@@ -24,7 +24,7 @@
def generatedResources = "$buildDir/generated/resources"
def prebuiltsRoot = SupportConfig.getPrebuiltsRootPath(project)
def debugKeystore = "${SupportConfig.getKeystore(project)}"
-def agpVersion = SupportConfig.getAGPVersion(project)
+def agpDependency = AGP_LATEST
def supportRepo = SupportConfig.getSupportRepoPath(project)
sourceSets {
@@ -54,7 +54,7 @@
writer.write("buildToolsVersion=$SupportConfig.BUILD_TOOLS_VERSION\n")
writer.write("minSdkVersion=$SupportConfig.DEFAULT_MIN_SDK_VERSION\n")
writer.write("debugKeystore=$debugKeystore\n")
- writer.write("agpVersion=$agpVersion\n")
+ writer.write("agpDependency=$agpDependency\n")
writer.write("gradleVersion=$gradleVersion\n")
writer.write("supportRepo=$supportRepo\n")
}
diff --git a/lifecycle/integration-tests/incrementality/src/test/kotlin/androidx/lifecycle/IncrementalAnnotationProcessingTest.kt b/lifecycle/integration-tests/incrementality/src/test/kotlin/androidx/lifecycle/IncrementalAnnotationProcessingTest.kt
index de75ec0..8065773 100644
--- a/lifecycle/integration-tests/incrementality/src/test/kotlin/androidx/lifecycle/IncrementalAnnotationProcessingTest.kt
+++ b/lifecycle/integration-tests/incrementality/src/test/kotlin/androidx/lifecycle/IncrementalAnnotationProcessingTest.kt
@@ -65,7 +65,7 @@
private lateinit var buildToolsVersion: String
private lateinit var minSdkVersion: String
private lateinit var debugKeystore: String
- private lateinit var agpVersion: String
+ private lateinit var agpDependency: String
private lateinit var gradleVersion: String
private lateinit var supportRepo: String
@@ -223,7 +223,7 @@
maven { url "$prebuiltsRepo/androidx/internal" }
}
dependencies {
- classpath "com.android.tools.build:gradle:$agpVersion"
+ classpath "$agpDependency"
}
}
@@ -352,7 +352,7 @@
buildToolsVersion = properties.getProperty("buildToolsVersion")
minSdkVersion = properties.getProperty("minSdkVersion")
debugKeystore = properties.getProperty("debugKeystore")
- agpVersion = properties.getProperty("agpVersion")
+ agpDependency = properties.getProperty("agpDependency")
gradleVersion = properties.getProperty("gradleVersion")
supportRepo = properties.getProperty("supportRepo")
}
diff --git a/navigation/navigation-safe-args-gradle-plugin/build.gradle b/navigation/navigation-safe-args-gradle-plugin/build.gradle
index f34e087..9c382fa 100644
--- a/navigation/navigation-safe-args-gradle-plugin/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/build.gradle
@@ -38,7 +38,7 @@
}
dependencies {
- compile(ANDROID_GRADLE_PLUGIN)
+ compile(AGP_STABLE)
compile(KOTLIN_GRADLE_PLUGIN)
compile project(":navigation:navigation-safe-args-generator")
compile gradleApi()
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index dc412b8..9fb3baf 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -40,7 +40,7 @@
}
testImplementation project(':internal-testutils-common')
testImplementation project(':internal-testutils-ktx')
- testImplementation(KOTLIN_TEST_COMMON)
+ testImplementation(KOTLIN_TEST)
testImplementation(TRUTH)
}
diff --git a/paging/rxjava2/build.gradle b/paging/rxjava2/build.gradle
index a326ae4..3c6d7fb 100644
--- a/paging/rxjava2/build.gradle
+++ b/paging/rxjava2/build.gradle
@@ -35,7 +35,7 @@
testImplementation project(':internal-testutils-common')
testImplementation(JUNIT)
- testImplementation(KOTLIN_TEST_COMMON)
+ testImplementation(KOTLIN_TEST)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/room/integration-tests/incremental-annotation-processing/build.gradle b/room/integration-tests/incremental-annotation-processing/build.gradle
index 44e682c..c02ecb2 100644
--- a/room/integration-tests/incremental-annotation-processing/build.gradle
+++ b/room/integration-tests/incremental-annotation-processing/build.gradle
@@ -25,7 +25,7 @@
def generatedResources = "$buildDir/generated/resources"
def prebuiltsRoot = SupportConfig.getPrebuiltsRootPath(project)
def localSupportRepo = SupportConfig.getSupportRepoPath(project)
-def agpVersion = SupportConfig.getAGPVersion(project)
+def agpDependency = AGP_LATEST
def debugKeystore = "${SupportConfig.getKeystore(project)}"
sourceSets {
@@ -54,7 +54,7 @@
new File(generatedResources, "sdk.prop").withWriter('UTF-8') { writer ->
writer.write("prebuiltsRepo=$prebuiltsRoot\n")
writer.write("localSupportRepo=$localSupportRepo\n")
- writer.write("agpVersion=$agpVersion\n")
+ writer.write("agpDependency=$agpDependency\n")
writer.write("compileSdkVersion=$SupportConfig.TARGET_SDK_VERSION\n")
writer.write("buildToolsVersion=$SupportConfig.BUILD_TOOLS_VERSION\n")
writer.write("minSdkVersion=$SupportConfig.DEFAULT_MIN_SDK_VERSION\n")
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
index 9eb8848..d7e35d6 100644
--- a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
+++ b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
@@ -56,7 +56,7 @@
// Properties to set up test project
private lateinit var prebuiltsRepo: String
- private lateinit var agpVersion: String
+ private lateinit var agpDependency: String
private lateinit var localSupportRepo: String
private lateinit var compileSdkVersion: String
private lateinit var buildToolsVersion: String
@@ -113,7 +113,7 @@
val properties = Properties().apply { load(input) }
prebuiltsRepo = properties.getProperty("prebuiltsRepo")
localSupportRepo = properties.getProperty("localSupportRepo")
- agpVersion = properties.getProperty("agpVersion")
+ agpDependency = properties.getProperty("agpDependency")
compileSdkVersion = properties.getProperty("compileSdkVersion")
buildToolsVersion = properties.getProperty("buildToolsVersion")
minSdkVersion = properties.getProperty("minSdkVersion")
@@ -137,7 +137,7 @@
maven { url "$prebuiltsRepo/androidx/internal" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:$agpVersion'
+ classpath "$agpDependency"
}
}
@@ -508,4 +508,4 @@
)
}
}
-}
\ No newline at end of file
+}
diff --git a/ui/integration-tests/benchmark/build.gradle b/ui/integration-tests/benchmark/build.gradle
index 3967ee9..3160fcd 100644
--- a/ui/integration-tests/benchmark/build.gradle
+++ b/ui/integration-tests/benchmark/build.gradle
@@ -34,7 +34,7 @@
implementation project(":benchmark:benchmark-junit4")
implementation project(":compose:compose-runtime")
implementation project(":ui:integration-tests:test")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation(JUNIT)
androidTestImplementation project(":ui:ui-core")
androidTestImplementation project(":ui:ui-framework")
diff --git a/ui/integration-tests/demos/build.gradle b/ui/integration-tests/demos/build.gradle
index c5240c3..dc318e6 100644
--- a/ui/integration-tests/demos/build.gradle
+++ b/ui/integration-tests/demos/build.gradle
@@ -16,7 +16,7 @@
implementation(project(":ui:ui-material:integration-tests:ui-material-demos"))
implementation(project(":ui:ui-foundation:integration-tests:ui-foundation-demos"))
implementation(project(":ui:ui-text:integration-tests:ui-text-demos"))
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
androidTestImplementation project(':ui:ui-test')
androidTestImplementation(JUNIT)
diff --git a/ui/integration-tests/test/build.gradle b/ui/integration-tests/test/build.gradle
index 8ac71be..aa9a0e2 100644
--- a/ui/integration-tests/test/build.gradle
+++ b/ui/integration-tests/test/build.gradle
@@ -32,7 +32,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation(JUNIT)
implementation(TRUTH)
diff --git a/ui/ui-android-text/build.gradle b/ui/ui-android-text/build.gradle
index 2ccef90..530006d 100644
--- a/ui/ui-android-text/build.gradle
+++ b/ui/ui-android-text/build.gradle
@@ -28,7 +28,7 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-android-view-non-ir/build.gradle b/ui/ui-android-view-non-ir/build.gradle
index 180a0a4..902b7a3 100644
--- a/ui/ui-android-view-non-ir/build.gradle
+++ b/ui/ui-android-view-non-ir/build.gradle
@@ -28,11 +28,11 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_COROUTINES)
+ implementation(KOTLIN_COROUTINES_ANDROID)
// TODO: remove / refactor out reflection dependencies, this is a large dependency to bundle
// with a library.
- implementation(KOTLIN_COMPOSE_REFLECT)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_REFLECT)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-android-view/build.gradle b/ui/ui-android-view/build.gradle
index 6b44ce0..9888349 100644
--- a/ui/ui-android-view/build.gradle
+++ b/ui/ui-android-view/build.gradle
@@ -31,8 +31,8 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-animation-core/build.gradle b/ui/ui-animation-core/build.gradle
index 5519f8d..f301b94 100644
--- a/ui/ui-animation-core/build.gradle
+++ b/ui/ui-animation-core/build.gradle
@@ -29,7 +29,7 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
diff --git a/ui/ui-animation-core/integration-tests/samples/build.gradle b/ui/ui-animation-core/integration-tests/samples/build.gradle
index 149a79e..3557671 100644
--- a/ui/ui-animation-core/integration-tests/samples/build.gradle
+++ b/ui/ui-animation-core/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-animation/build.gradle b/ui/ui-animation/build.gradle
index abecfae..c5fe45b 100644
--- a/ui/ui-animation/build.gradle
+++ b/ui/ui-animation/build.gradle
@@ -31,7 +31,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-animation/integration-tests/animation-demos/build.gradle b/ui/ui-animation/integration-tests/animation-demos/build.gradle
index 76dfdfd..9530e43 100644
--- a/ui/ui-animation/integration-tests/animation-demos/build.gradle
+++ b/ui/ui-animation/integration-tests/animation-demos/build.gradle
@@ -15,7 +15,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-animation/integration-tests/samples/build.gradle b/ui/ui-animation/integration-tests/samples/build.gradle
index ee789e1..5a479b7 100644
--- a/ui/ui-animation/integration-tests/samples/build.gradle
+++ b/ui/ui-animation/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-core/build.gradle b/ui/ui-core/build.gradle
index 7ceab95..0d734be 100644
--- a/ui/ui-core/build.gradle
+++ b/ui/ui-core/build.gradle
@@ -29,7 +29,7 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-core/integration-tests/samples/build.gradle b/ui/ui-core/integration-tests/samples/build.gradle
index 5292b97..d881464 100644
--- a/ui/ui-core/integration-tests/samples/build.gradle
+++ b/ui/ui-core/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-foundation/build.gradle b/ui/ui-foundation/build.gradle
index 3d5a7ac..8c5b188 100644
--- a/ui/ui-foundation/build.gradle
+++ b/ui/ui-foundation/build.gradle
@@ -31,7 +31,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-foundation/integration-tests/foundation-demos/build.gradle b/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
index 0ad2ed8..5c91386 100644
--- a/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
+++ b/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
@@ -31,8 +31,8 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-foundation/integration-tests/samples/build.gradle b/ui/ui-foundation/integration-tests/samples/build.gradle
index beb8562..ba7a9a4 100644
--- a/ui/ui-foundation/integration-tests/samples/build.gradle
+++ b/ui/ui-foundation/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-framework/build.gradle b/ui/ui-framework/build.gradle
index 332c2a9..0ed45c1 100644
--- a/ui/ui-framework/build.gradle
+++ b/ui/ui-framework/build.gradle
@@ -30,8 +30,8 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_STDLIB)
// TODO: Non-Kotlin dependency, move to Android-specific code
implementation "androidx.core:core:1.0.2"
diff --git a/ui/ui-framework/integration-tests/framework-demos/build.gradle b/ui/ui-framework/integration-tests/framework-demos/build.gradle
index b3ebb09..4e0efbd9 100644
--- a/ui/ui-framework/integration-tests/framework-demos/build.gradle
+++ b/ui/ui-framework/integration-tests/framework-demos/build.gradle
@@ -14,7 +14,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-framework/integration-tests/samples/build.gradle b/ui/ui-framework/integration-tests/samples/build.gradle
index 7bcd7dd..f83e20c 100644
--- a/ui/ui-framework/integration-tests/samples/build.gradle
+++ b/ui/ui-framework/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-layout/build.gradle b/ui/ui-layout/build.gradle
index 7b8fe2c..6805851 100644
--- a/ui/ui-layout/build.gradle
+++ b/ui/ui-layout/build.gradle
@@ -32,7 +32,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-layout/integration-tests/layout-demos/build.gradle b/ui/ui-layout/integration-tests/layout-demos/build.gradle
index 3f93c7f..de2f881 100644
--- a/ui/ui-layout/integration-tests/layout-demos/build.gradle
+++ b/ui/ui-layout/integration-tests/layout-demos/build.gradle
@@ -29,8 +29,8 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-layout/integration-tests/samples/build.gradle b/ui/ui-layout/integration-tests/samples/build.gradle
index dc92784..2f85730 100644
--- a/ui/ui-layout/integration-tests/samples/build.gradle
+++ b/ui/ui-layout/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
implementation project(":compose:compose-runtime")
diff --git a/ui/ui-material/build.gradle b/ui/ui-material/build.gradle
index 66f3669..0ceb2c1 100644
--- a/ui/ui-material/build.gradle
+++ b/ui/ui-material/build.gradle
@@ -31,7 +31,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-material/integration-tests/material-demos/build.gradle b/ui/ui-material/integration-tests/material-demos/build.gradle
index 432166d..674c142 100644
--- a/ui/ui-material/integration-tests/material-demos/build.gradle
+++ b/ui/ui-material/integration-tests/material-demos/build.gradle
@@ -15,9 +15,9 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_REFLECT)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_REFLECT)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-material/integration-tests/material-studies/build.gradle b/ui/ui-material/integration-tests/material-studies/build.gradle
index 371a166..56efbbf 100644
--- a/ui/ui-material/integration-tests/material-studies/build.gradle
+++ b/ui/ui-material/integration-tests/material-studies/build.gradle
@@ -29,7 +29,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-material/integration-tests/samples/build.gradle b/ui/ui-material/integration-tests/samples/build.gradle
index 81fe717..3762ffd 100644
--- a/ui/ui-material/integration-tests/samples/build.gradle
+++ b/ui/ui-material/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-platform/build.gradle b/ui/ui-platform/build.gradle
index 3d963a9..36160e6 100644
--- a/ui/ui-platform/build.gradle
+++ b/ui/ui-platform/build.gradle
@@ -29,8 +29,8 @@
}
dependencies {
- implementation(KOTLIN_COMPOSE_COROUTINES)
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.core:core:1.0.2"
diff --git a/ui/ui-test/build.gradle b/ui/ui-test/build.gradle
index 1c92fc6..b955db8 100644
--- a/ui/ui-test/build.gradle
+++ b/ui/ui-test/build.gradle
@@ -31,7 +31,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation(ANDROIDX_TEST_RULES)
implementation(ANDROIDX_TEST_RUNNER)
implementation(ESPRESSO_CORE)
diff --git a/ui/ui-text/build.gradle b/ui/ui-text/build.gradle
index 44642eb..9305e31 100644
--- a/ui/ui-text/build.gradle
+++ b/ui/ui-text/build.gradle
@@ -30,7 +30,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
// TODO: Non-Kotlin dependency, move to Android-specific code
implementation "androidx.collection:collection:1.1.0"
diff --git a/ui/ui-text/integration-tests/samples/build.gradle b/ui/ui-text/integration-tests/samples/build.gradle
index e4bc268..d6194ef 100644
--- a/ui/ui-text/integration-tests/samples/build.gradle
+++ b/ui/ui-text/integration-tests/samples/build.gradle
@@ -28,7 +28,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation project(":annotation:annotation-sampled")
diff --git a/ui/ui-text/integration-tests/text-demos/build.gradle b/ui/ui-text/integration-tests/text-demos/build.gradle
index ba811c1..b719165 100644
--- a/ui/ui-text/integration-tests/text-demos/build.gradle
+++ b/ui/ui-text/integration-tests/text-demos/build.gradle
@@ -12,7 +12,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.activity:activity:1.0.0-alpha01"
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-tooling/build.gradle b/ui/ui-tooling/build.gradle
index 816a507..e67c332 100644
--- a/ui/ui-tooling/build.gradle
+++ b/ui/ui-tooling/build.gradle
@@ -31,7 +31,7 @@
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler", configuration: "embeddablePlugin")
- implementation(KOTLIN_COMPOSE_STDLIB)
+ implementation(KOTLIN_STDLIB)
implementation "androidx.annotation:annotation:1.1.0"
diff --git a/ui/ui-vector/build.gradle b/ui/ui-vector/build.gradle
index 2485c67..d994acf 100644
--- a/ui/ui-vector/build.gradle
+++ b/ui/ui-vector/build.gradle
@@ -34,7 +34,7 @@
api project(':ui:ui-core')
implementation "androidx.collection:collection:1.0.0"
api project(":compose:compose-runtime")
- implementation (KOTLIN_COMPOSE_STDLIB)
+ implementation (KOTLIN_STDLIB)
// TODO: Non-Kotlin dependency, move to Android-specific code
// implementation "androidx.collection:collection:1.0.0-alpha01"
