Configure radar-commons-gradle to use the version catalog of the root…

… project
RADAR-base · Sep 26, 2024 · 99efcc7 · 99efcc7
1 parent 631ec5b
commit 99efcc7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 58 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,5 @@
 # IMPORTANT!! The versions in the following files must be kept in sync:
 # - gradle/libs.versions.toml
-# - radar-commons-gradle/gradle/libs.versions.toml
 # - radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/Versions.kt
 [versions]
 

diff --git a/radar-commons-gradle/gradle.properties b/radar-commons-gradle/gradle.properties
@@ -1 +1,2 @@
+# IMPORTANT!! Also set projectVersion in gradle.properties of the root project.
 projectVersion=1.1.3-SNAPSHOT
diff --git a/radar-commons-gradle/gradle/libs.versions.toml b/radar-commons-gradle/gradle/libs.versions.toml
diff --git a/radar-commons-gradle/settings.gradle.kts b/radar-commons-gradle/settings.gradle.kts
@@ -0,0 +1,8 @@
+// Allows to use the root project version catalog in the includeBuild module
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/Versions.kt b/radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/Versions.kt
@@ -4,7 +4,6 @@ package org.radarbase.gradle.plugin
  Versions are defined in this object because they cannot be read from the gradle project.
  IMPORTANT!! The versions in the following files must be kept in sync:
  - gradle/libs.versions.toml
- - radar-commons-gradle/gradle/libs.versions.toml
  - radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/Versions.kt
 */
 @Suppress("ktlint:standard:property-naming")
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# IMPORTANT!! Also set projectVersion in gradle.properties of the root project.
		projectVersion=1.1.3-SNAPSHOT