Move versions from Platform into Version Catalog

Replaces the 'gradle/platform' project by versions added directly to 'gradle/libs.versions.toml'.
jjohannes · Jun 24, 2024 · 2e5dfa1 · 2e5dfa1
1 parent d0e2749
commit 2e5dfa1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 52 deletions.
diff --git a/aggregation/settings.gradle.kts b/aggregation/settings.gradle.kts
@@ -5,8 +5,6 @@ pluginManagement {
 dependencyResolutionManagement {
     repositories.mavenCentral()
 
-    includeBuild("../gradle/platform")
-
     includeBuild("../product/ig-server")
 
     include("publish-api")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,18 @@
+[versions]
+jetty = "9.4.30.v20200611"
+junit = "5.6.2"
+
 [libraries]
-jetty-bom = { module = "org.eclipse.jetty:jetty-bom" }
-jetty-server = { module = "org.eclipse.jetty:jetty-server" }
-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet" }
+jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
+jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }
 
-guava = { module = "com.google.guava:guava" }
+guava = { module = "com.google.guava:guava", version = "29.0-jre" }
 
-httpclient = { module = "org.apache.httpcomponents:httpclient" }
+httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.12" }
 
-junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 
 # Gradle plugin dependencies
-gradlex-jvm-dependency-conflict-resolution = { module = "org.gradlex:jvm-dependency-conflict-resolution"}
+gradlex-jvm-dependency-conflict-resolution = { module = "org.gradlex:jvm-dependency-conflict-resolution", version = "2.1.1"}
diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts
diff --git a/gradle/platform/settings.gradle.kts b/gradle/platform/settings.gradle.kts
diff --git a/gradle/plugins/java-convention/build.gradle.kts b/gradle/plugins/java-convention/build.gradle.kts
@@ -7,7 +7,6 @@ group = "com.example.buildlogic"
 dependencies {
     implementation(project(":versioning"))
 
-    implementation(platform("com.example.idiomatic.gradle:platform"))
     implementation(libs.guava) // example of using a standard Java library in your plugins
     implementation(libs.gradlex.jvm.dependency.conflict.resolution) // example of using a Gradle community plugin
 }
diff --git a/gradle/plugins/java-convention/src/main/kotlin/com.example.end2end-testing.gradle.kts b/gradle/plugins/java-convention/src/main/kotlin/com.example.end2end-testing.gradle.kts
@@ -51,7 +51,6 @@ class ServerJarArgumentProvider(objects: ObjectFactory, path: Configuration) : C
 // JUnit5 dependencies
 val libs = the<VersionCatalogsExtension>().named("libs")
 dependencies {
-    "end2endTestImplementation"(platform("com.example.idiomatic.gradle:platform"))
     "end2endTestImplementation"(libs.findLibrary("junit.api").get())
     "end2endTestRuntimeOnly"(libs.findLibrary("junit.engine").get())
     "end2endTestRuntimeOnly"(libs.findLibrary("junit.launcher").get())

diff --git a/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts b/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts
@@ -8,10 +8,6 @@ plugins {
     id("org.gradlex.jvm-dependency-conflict-detection")
 }
 
-dependencies {
-    implementation(platform("com.example.idiomatic.gradle:platform"))
-}
-
 // configure details of java compilation
 tasks.withType<JavaCompile>().configureEach {
     options.headerOutputDirectory.convention(null as Directory?) // currently, need to clear convention to remove

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
@@ -1,7 +1,6 @@
 dependencyResolutionManagement {
     repositories.mavenCentral()
     repositories.gradlePluginPortal()
-    includeBuild("../platform")
 
     versionCatalogs.create("libs") {
         from(files("../libs.versions.toml"))

diff --git a/gradle/settings/src/main/kotlin/com.example.repositories.settings.gradle.kts b/gradle/settings/src/main/kotlin/com.example.repositories.settings.gradle.kts
@@ -5,8 +5,6 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories.mavenCentral()
-    // Platform for dependency versions shared by 'main build' and 'build-logic'
-    includeBuild("../../gradle/platform")
     // For end2end testing
     includeBuild("../../aggregation")