Merge pull request #648 from square/rick/libs_versions_toml

migrate dependency definitions to version catalogs

Author: RBusarow

.buildscript/android-sample-app.gradle

@@ -6,6 +6,6 @@ dependencies {
   implementation(project(":workflow-core"))
   implementation(project(":workflow-runtime"))
 
-  implementation(Deps.get("androidx.appcompat"))
-  implementation(Deps.get("timber"))
+  implementation(libs.androidx.appcompat)
+  implementation(libs.timber)
 }

.buildscript/android-ui-tests.gradle

@@ -11,7 +11,7 @@ android {
 
 dependencies {
   androidTestImplementation project(":workflow-ui:internal-testing-android")
-  androidTestImplementation Deps.get("test.androidx.espresso.core")
-  androidTestImplementation Deps.get("test.androidx.junitExt")
-  androidTestImplementation Deps.get("test.leakcanaryInstrumentation")
+  androidTestImplementation(libs.androidx.test.espresso.core)
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.squareup.leakcanary.instrumentation)
 }

build.gradle.kts

@@ -5,15 +5,15 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 buildscript {
   dependencies {
-    classpath(Dependencies.android_gradle_plugin)
-    classpath(Dependencies.dokka)
-    classpath(Dependencies.Jmh.gradlePlugin)
-    classpath(Dependencies.Kotlin.binaryCompatibilityValidatorPlugin)
-    classpath(Dependencies.Kotlin.gradlePlugin)
-    classpath(Dependencies.Kotlin.Serialization.gradlePlugin)
-    classpath(Dependencies.ksp)
-    classpath(Dependencies.ktlint)
-    classpath(Dependencies.mavenPublish)
+    classpath(libs.android.gradle.plugin)
+    classpath(libs.jmh.gradle.plugin)
+    classpath(libs.dokka.gradle.plugin)
+    classpath(libs.kotlin.serialization.gradle.plugin)
+    classpath(libs.kotlinx.binaryCompatibility.gradle.plugin)
+    classpath(libs.kotlin.gradle.plugin)
+    classpath(libs.google.ksp)
+    classpath(libs.ktlint.gradle)
+    classpath(libs.vanniktech.publish)
   }
 
   repositories {
@@ -29,17 +29,13 @@ buildscript {
 val isRunningFromIde get() = project.properties["android.injected.invoked.from.ide"] == "true"
 
 subprojects {
-  repositories {
-    google()
-    mavenCentral()
-  }
 
   apply(plugin = "org.jlleitschuh.gradle.ktlint")
   afterEvaluate {
     configurations.configureEach {
       // There could be transitive dependencies in tests with a lower version. This could cause
       // problems with a newer Kotlin version that we use.
-      resolutionStrategy.force(Dependencies.Kotlin.reflect)
+      resolutionStrategy.force(libs.kotlin.reflect)
     }
   }
 
@@ -100,9 +96,6 @@ allprojects.filterNot { it.path.startsWith(":samples") }
 // This plugin needs to be applied to the root projects for the dokkaGfmCollector task we use to
 // generate the documentation site.
 apply(plugin = "org.jetbrains.dokka")
-repositories {
-  mavenCentral()
-}
 
 // Configuration that applies to all dokka tasks, both those used for generating javadoc artifacts
 // and the documentation site.
@@ -124,6 +117,20 @@ subprojects {
   }
 }
 
+allprojects {
+
+  configurations.all {
+    resolutionStrategy.eachDependency {
+      // This ensures that any time a dependency has a transitive dependency upon androidx.lifecycle,
+      // it uses the same version as the rest of the project.  This is crucial, since Androidx
+      // libraries are never in sync and lifecycle 2.4.0 introduced api-breaking changes.
+      if (requested.group == "androidx.lifecycle") {
+        useVersion(libs.versions.androidx.lifecycle.get())
+      }
+    }
+  }
+}
+
 // This task is invoked by the documentation site generator script in the main workflow project (not
 // in this repo), which also expects the generated files to be in a specific location. Both the task
 // name and destination directory are defined in this script:

buildSrc/settings.gradle.kts

@@ -0,0 +1,13 @@
+enableFeaturePreview("VERSION_CATALOGS")
+
+dependencyResolutionManagement {
+
+  @Suppress("UnstableApiUsage")
+  versionCatalogs {
+
+    create("libs") {
+      // Re-use the version catalog file from the main project
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
+}

buildSrc/src/main/java/Dependencies.kt

@@ -0,0 +1,5 @@
+@Suppress("UNUSED") // used in Groovy convention scripts
+object Versions {
+  const val compileSdk = 31
+  const val targetSdk = 30
+}