Migrate to version catalogs.

Author: zach-klippenstein

build.gradle.kts

@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
-println("Building with Kotlin compiler version ${Versions.KotlinCompiler}")
+println("Building with Kotlin compiler version ${libs.versions.kotlin.get()}")
 
 buildscript {
   repositories {
@@ -33,14 +33,14 @@ buildscript {
   }
 
   dependencies {
-    classpath(Dependencies.Build.Android)
-    classpath(Dependencies.Build.MavenPublish)
-    classpath(Dependencies.Build.Kotlin)
-    classpath(Dependencies.Build.Ktlint)
-    classpath(Dependencies.Build.BinaryCompatibility)
+    classpath(libs.build.android)
+    classpath(libs.build.mavenPublish)
+    classpath(libs.build.kotlin)
+    classpath(libs.build.ktlint)
+    classpath(libs.build.binaryCompatibility)
     // Required for the gradle-maven-publish-plugin plugin.
     // See https://github.com/vanniktech/gradle-maven-publish-plugin/issues/205.
-    classpath(Dependencies.Build.Dokka)
+    classpath(libs.build.dokka)
   }
 }
 

buildSrc/build.gradle.kts

@@ -25,7 +25,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = Versions.ComposeCompiler
+    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
   }
 
   packaging {
@@ -49,11 +49,11 @@ tasks.withType<KotlinCompile> {
 
 dependencies {
   androidTestImplementation(project(":radiography"))
-  androidTestImplementation(Dependencies.AppCompat)
-  androidTestImplementation(Dependencies.Compose().Material)
-  androidTestImplementation(Dependencies.Compose().Testing)
-  androidTestImplementation(Dependencies.Compose().Tooling)
-  androidTestImplementation(Dependencies.InstrumentationTests.Rules)
-  androidTestImplementation(Dependencies.InstrumentationTests.Runner)
-  androidTestImplementation(Dependencies.Truth)
+  androidTestImplementation(libs.appCompat)
+  androidTestImplementation(libs.compose.material)
+  androidTestImplementation(libs.compose.testing)
+  androidTestImplementation(libs.compose.tooling)
+  androidTestImplementation(libs.test.androidx.rules)
+  androidTestImplementation(libs.test.androidx.runner)
+  androidTestImplementation(libs.test.truth)
 }

buildSrc/src/main/java/Dependencies.kt

@@ -5,12 +5,6 @@ plugins {
   kotlin("android")
 }
 
-/**
- * Allows using a different version of Compose to validate that we degrade gracefully on apps
- * built with unsupported Compose versions.
- */
-val oldComposeVersion = "1.3.0"
-
 android {
   compileSdk = 34
 
@@ -31,7 +25,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = Versions.ComposeCompiler
+    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
   }
 
   packaging {
@@ -55,12 +49,12 @@ tasks.withType<KotlinCompile> {
 
 dependencies {
   androidTestImplementation(project(":radiography"))
-  androidTestImplementation(Dependencies.AppCompat)
-  androidTestImplementation(Dependencies.Compose().Activity("1.3.0-alpha02"))
-  androidTestImplementation(Dependencies.Compose(oldComposeVersion).Material)
-  androidTestImplementation(Dependencies.Compose(oldComposeVersion).Testing)
-  androidTestImplementation(Dependencies.InstrumentationTests.Rules)
-  androidTestImplementation(Dependencies.InstrumentationTests.JUnit)
-  androidTestImplementation(Dependencies.InstrumentationTests.Runner)
-  androidTestImplementation(Dependencies.Truth)
+  androidTestImplementation(libs.appCompat)
+  androidTestImplementation(libs.compose.old.activity)
+  androidTestImplementation(libs.compose.old.material)
+  androidTestImplementation(libs.compose.old.testing)
+  androidTestImplementation(libs.test.androidx.rules)
+  androidTestImplementation(libs.test.junit)
+  androidTestImplementation(libs.test.androidx.runner)
+  androidTestImplementation(libs.test.truth)
 }

compose-tests/build.gradle.kts

@@ -0,0 +1,67 @@
+[versions]
+
+agp = "8.1.2"
+kotlin = "1.9.10"
+androidx-test = "1.5.0"
+compose-compiler = "1.5.3"
+
+# We compile against an older version of Compose intentionally to support consumers that aren't on
+# the latest.
+#noinspection GradleDependency
+compose = "1.7.0-beta05"
+# Allows using a different version of Compose to validate that we degrade gracefully on apps
+# built with unsupported Compose versions.
+#noinspection GradleDependency
+compose-old = "1.3.0"
+# Use a separate property for the sample so we can test with different versions easily.
+compose-sample = "1.6.8"
+compose-sample-compiler = "1.5.3"
+
+[libraries]
+
+build-android = "com.android.tools.build:gradle:8.1.2"
+build-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
+build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+build-ktlint = "org.jlleitschuh.gradle:ktlint-gradle:11.6.1"
+build-binaryCompatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0"
+build-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
+
+appCompat = "androidx.appcompat:appcompat:1.3.1"
+constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.0"
+curtains = "com.squareup.curtains:curtains:1.2.2"
+
+compose-activity = "androidx.activity:activity-compose:1.3.1"
+#noinspection SimilarGradleDependency
+compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
+#noinspection SimilarGradleDependency
+compose-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
+#noinspection SimilarGradleDependency
+compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+compose-toolingData = { module = "androidx.compose.ui:ui-tooling-data", version.ref = "compose" }
+
+#noinspection SimilarGradleDependency
+compose-sample-activity = "androidx.activity:activity-compose:1.3.1"
+#noinspection SimilarGradleDependency
+compose-sample-material = { module = "androidx.compose.material:material", version.ref = "compose-sample" }
+#noinspection SimilarGradleDependency
+compose-sample-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-sample" }
+#noinspection SimilarGradleDependency
+compose-sample-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-sample" }
+
+#noinspection SimilarGradleDependency
+compose-old-activity = "androidx.activity:activity-compose:1.3.0-alpha02"
+#noinspection SimilarGradleDependency
+compose-old-material = { module = "androidx.compose.material:material", version.ref = "compose-old" }
+#noinspection SimilarGradleDependency
+compose-old-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-old" }
+
+test-junit = "junit:junit:4.13"
+test-mockito = "org.mockito:mockito-core:3.11.2"
+test-robolectric = "org.robolectric:robolectric:4.10.3"
+test-truth = "com.google.truth:truth:1.1.3"
+test-androidx-core = { module = "androidx.test:core", version.ref = "androidx-test" }
+test-androidx-espresso = "androidx.test.espresso:espresso-core:3.5.1"
+test-androidx-junit = "androidx.test.ext:junit:1.1.5"
+test-androidx-orchestrator = "androidx.test:orchestrator:1.4.2"
+test-androidx-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
+test-androidx-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }

compose-unsupported-tests/build.gradle.kts

@@ -63,20 +63,20 @@ tasks.withType<KotlinCompile> {
 }
 
 dependencies {
-  implementation(Dependencies.Curtains)
+  implementation(libs.curtains)
   // We don't want to bring any Compose dependencies in unless the consumer of this library is
   // bringing them in itself.
-  compileOnly(Dependencies.Compose().ToolingData)
+  compileOnly(libs.compose.toolingData)
 
-  testImplementation(Dependencies.JUnit)
-  testImplementation(Dependencies.Mockito)
-  testImplementation(Dependencies.Robolectric)
-  testImplementation(Dependencies.Truth)
+  testImplementation(libs.test.junit)
+  testImplementation(libs.test.mockito)
+  testImplementation(libs.test.robolectric)
+  testImplementation(libs.test.truth)
 
-  androidTestImplementation(Dependencies.InstrumentationTests.Core)
-  androidTestImplementation(Dependencies.InstrumentationTests.Espresso)
-  androidTestImplementation(Dependencies.InstrumentationTests.Rules)
-  androidTestImplementation(Dependencies.InstrumentationTests.Runner)
-  androidTestImplementation(Dependencies.Truth)
-  androidTestUtil(Dependencies.InstrumentationTests.Orchestrator)
+  androidTestImplementation(libs.test.androidx.core)
+  androidTestImplementation(libs.test.androidx.espresso)
+  androidTestImplementation(libs.test.androidx.rules)
+  androidTestImplementation(libs.test.androidx.runner)
+  androidTestImplementation(libs.test.truth)
+  androidTestUtil(libs.test.androidx.orchestrator)
 }

gradle/libs.versions.toml

@@ -5,10 +5,6 @@ plugins {
   kotlin("android")
 }
 
-/** Use a separate property for the sample so we can test with different versions easily. */
-val sampleComposeVersion = "1.6.8"
-val sampleComposeCompilerVersion = "1.5.3"
-
 android {
   compileSdk = 34
 
@@ -29,7 +25,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = sampleComposeCompilerVersion
+    kotlinCompilerExtensionVersion = libs.versions.compose.sample.compiler.get()
   }
 
   packaging {
@@ -53,12 +49,12 @@ tasks.withType<KotlinCompile> {
 
 dependencies {
   implementation(project(":radiography"))
-  implementation(Dependencies.AppCompat)
-  implementation(Dependencies.Compose(sampleComposeVersion).Activity())
-  implementation(Dependencies.Compose(sampleComposeVersion).Material)
-  implementation(Dependencies.Compose(sampleComposeVersion).Tooling)
-
-  androidTestImplementation(Dependencies.Compose(sampleComposeVersion).Testing)
-  androidTestImplementation(Dependencies.InstrumentationTests.Rules)
-  androidTestImplementation(Dependencies.InstrumentationTests.Runner)
+  implementation(libs.appCompat)
+  implementation(libs.compose.sample.activity)
+  implementation(libs.compose.sample.material)
+  implementation(libs.compose.sample.tooling)
+
+  androidTestImplementation(libs.compose.sample.testing)
+  androidTestImplementation(libs.test.androidx.rules)
+  androidTestImplementation(libs.test.androidx.runner)
 }

radiography/build.gradle.kts

@@ -39,13 +39,13 @@ android {
 
 dependencies {
   implementation(project(":radiography"))
-  implementation(Dependencies.AppCompat)
-  implementation(Dependencies.ConstraintLayout)
+  implementation(libs.appCompat)
+  implementation(libs.constraintLayout)
 
-  androidTestImplementation(Dependencies.InstrumentationTests.Core)
-  androidTestImplementation(Dependencies.InstrumentationTests.Espresso)
-  androidTestImplementation(Dependencies.InstrumentationTests.Rules)
-  androidTestImplementation(Dependencies.InstrumentationTests.JUnit)
-  androidTestImplementation(Dependencies.InstrumentationTests.Runner)
-  androidTestImplementation(Dependencies.Truth)
+  androidTestImplementation(libs.test.androidx.core)
+  androidTestImplementation(libs.test.androidx.espresso)
+  androidTestImplementation(libs.test.androidx.rules)
+  androidTestImplementation(libs.test.androidx.junit)
+  androidTestImplementation(libs.test.androidx.runner)
+  androidTestImplementation(libs.test.truth)
 }