move to version calalogs.

SimY4 · SimY4 · commit cc5e0f5582fd · 2022-02-10T10:25:10.000+11:00
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.diffplug.spotless' version '6.2.2' apply false
     id 'cz.augi.gradle.wartremover' version '0.14.2' apply false
     id 'info.solidsoft.pitest' version '1.7.0' apply false
-    id 'java-platform'
     id 'me.champeau.jmh' version '0.6.6' apply false
     id 'net.ltgt.errorprone' version '2.0.2' apply false
     id 'net.researchgate.release' version '2.8.1'
@@ -11,7 +10,6 @@ plugins {
 
 subprojects {
     apply plugin: 'java-library'
-    apply from: rootProject.file('gradle/dependencies.gradle')
     apply from: rootProject.file('gradle/animal-sniffer.gradle')
     apply from: rootProject.file('gradle/check-checkstyle.gradle')
     apply from: rootProject.file('gradle/check-codecoverage.gradle')
@@ -26,22 +24,6 @@ subprojects {
         mavenCentral()
     }
 
-    configurations {
-        internal {
-            visible = false
-            canBeConsumed = false
-            canBeResolved = false
-        }
-        compileClasspath.extendsFrom internal
-        runtimeClasspath.extendsFrom internal
-        testCompileClasspath.extendsFrom internal
-        testRuntimeClasspath.extendsFrom internal
-    }
-
-    dependencies {
-        internal platform(rootProject)
-    }
-
     java {
         withJavadocJar()
         withSourcesJar()
@@ -83,23 +65,9 @@ subprojects {
     }
 }
 
-dependencies {
-    constraints {
-        api 'org.assertj:assertj-core:3.22.0'
-        api 'org.dom4j:dom4j:2.1.3'
-        api 'co.helmethair:scalatest-junit-runner:0.1.10'
-        api 'com.google.code.gson:gson:2.8.9'
-        api 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
-        api 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
-        api 'jakarta.json:jakarta.json-api:2.0.1'
-        api 'org.glassfish:jakarta.json:2.0.1'
-        api 'jaxen:jaxen:1.2.0'
-        api 'org.jdom:jdom2:2.0.6.1'
-        api 'org.junit.jupiter:junit-jupiter:5.8.2'
-        api 'org.junit.platform:junit-platform-engine:1.8.2'
-        api 'org.mockito:mockito-junit-jupiter:4.3.1'
-        api 'xom:xom:1.3.7'
-    }
+task build {
+    group = 'build'
+    description = 'Build All'
 }
 
 release {
diff --git a/gradle/benchmark-jmh.gradle b/gradle/benchmark-jmh.gradle
@@ -6,7 +6,6 @@ jmh {
 
 // after gradle 5.3 we need to set this attribute to mark test configuration targeting java 8
 [configurations.jmhCompileClasspath, configurations.jmhRuntimeClasspath].each {
-    it.extendsFrom configurations.internal
     it.attributes {
         attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
     }
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,43 @@
+[versions]
+jackson = '2.13.1'
+scala212 = '2.12.15'
+scala213 = '2.13.8'
+scala3 = '3.1.1'
+scalatest = '3.2.11'
+scalaxml = '2.0.1'
+
+[libraries]
+assertj = 'org.assertj:assertj-core:3.22.0'
+dom4j = 'org.dom4j:dom4j:2.1.3'
+gson = 'com.google.code.gson:gson:2.8.9'
+jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind', version.ref = 'jackson' }
+jackson-dataformat-yaml = { module = 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml', version.ref = 'jackson' }
+jaxen = 'jaxen:jaxen:1.2.0'
+jdom2 = 'org.jdom:jdom2:2.0.6.1'
+json-api = 'jakarta.json:jakarta.json-api:2.0.1'
+json-impl = 'org.glassfish:jakarta.json:2.0.1'
+junit-jupiter = 'org.junit.jupiter:junit-jupiter:5.8.2'
+junit-platform-engine = 'org.junit.platform:junit-platform-engine:1.8.2'
+mockito = 'org.mockito:mockito-junit-jupiter:4.3.1'
+scala-library-v212 = { module = 'org.scala-lang:scala-library', version.ref = 'scala212' }
+scala-library-v213 = { module = 'org.scala-lang:scala-library', version.ref = 'scala213' }
+scala-library-v3 = { module = 'org.scala-lang:scala3-library_3', version.ref = 'scala3' }
+scala-reflect-v212 = { module = 'org.scala-lang:scala-reflect', version.ref = 'scala212' }
+scala-reflect-v213 = { module = 'org.scala-lang:scala-reflect', version.ref = 'scala213' }
+scala-xml-v212 = { module = 'org.scala-lang.modules:scala-xml_2.12', version.ref = 'scalaxml' }
+scala-xml-v213 = { module = 'org.scala-lang.modules:scala-xml_2.13', version.ref = 'scalaxml' }
+scala-xml-v3 = { module = 'org.scala-lang.modules:scala-xml_3', version.ref = 'scalaxml' }
+scalatest-funspec-v212 = { module = 'org.scalatest:scalatest-funspec_2.12', version.ref = 'scalatest' }
+scalatest-funspec-v213 = { module = 'org.scalatest:scalatest-funspec_2.13', version.ref = 'scalatest' }
+scalatest-funspec-v3 = { module = 'org.scalatest:scalatest-funspec_3', version.ref = 'scalatest' }
+scalatest-shouldmatchers-v212 = { module = 'org.scalatest:scalatest-shouldmatchers_2.12', version.ref = 'scalatest' }
+scalatest-shouldmatchers-v213 = { module = 'org.scalatest:scalatest-shouldmatchers_2.13', version.ref = 'scalatest' }
+scalatest-shouldmatchers-v3 = { module = 'org.scalatest:scalatest-shouldmatchers_3', version.ref = 'scalatest' }
+scalatest-junit-runner = 'co.helmethair:scalatest-junit-runner:0.1.10'
+xom = 'xom:xom:1.3.7'
+
+[bundles]
+junit = ["junit-jupiter", "assertj"]
+scalatest-v212 = ["scalatest-funspec-v212", "scalatest-shouldmatchers-v212", "scalatest-junit-runner", "junit-platform-engine"]
+scalatest-v213 = ["scalatest-funspec-v213", "scalatest-shouldmatchers-v213", "scalatest-junit-runner", "junit-platform-engine"]
+scalatest-v3 = ["scalatest-funspec-v3", "scalatest-shouldmatchers-v3", "scalatest-junit-runner", "junit-platform-engine"]
diff --git a/xpath-to-json-gson/build.gradle b/xpath-to-json-gson/build.gradle
@@ -5,9 +5,8 @@ apply from: rootProject.file('gradle/benchmark-jmh.gradle')
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'com.google.code.gson:gson'
+    implementation libs.gson
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.bundles.junit
 }
diff --git a/xpath-to-json-jackson/build.gradle b/xpath-to-json-jackson/build.gradle
@@ -8,12 +8,11 @@ targetCompatibility = JavaVersion.VERSION_1_8
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation libs.jackson.databind
 
     testImplementation project(':xpath-to-xml-test')
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.bundles.junit
 }
 
 compileJava {
diff --git a/xpath-to-json-jakarta/build.gradle b/xpath-to-json-jakarta/build.gradle
@@ -8,12 +8,11 @@ targetCompatibility = JavaVersion.VERSION_1_8
 dependencies {
     api project(':xpath-to-xml-core')
 
-    compileOnly 'jakarta.json:jakarta.json-api'
+    compileOnly libs.json.api
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'org.glassfish:jakarta.json'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.json.impl
+    testImplementation libs.bundles.junit
 }
 
 compileJava {
diff --git a/xpath-to-xml-core/build.gradle b/xpath-to-xml-core/build.gradle
@@ -4,7 +4,6 @@ apply from: rootProject.file('gradle/check-mutationcoverage.gradle')
 
 dependencies {
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.mockito:mockito-junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.mockito
+    testImplementation libs.bundles.junit
 }
diff --git a/xpath-to-xml-dom/build.gradle b/xpath-to-xml-dom/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     api project(':xpath-to-xml-core')
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.mockito:mockito-junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.mockito
+    testImplementation libs.bundles.junit
 }
diff --git a/xpath-to-xml-dom4j/build.gradle b/xpath-to-xml-dom4j/build.gradle
@@ -8,12 +8,11 @@ targetCompatibility = JavaVersion.VERSION_1_8
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'org.dom4j:dom4j'
+    implementation libs.dom4j
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'jaxen:jaxen'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.jaxen
+    testImplementation libs.bundles.junit
 }
 
 compileJava {
diff --git a/xpath-to-xml-jdom/build.gradle b/xpath-to-xml-jdom/build.gradle
@@ -5,10 +5,9 @@ apply from: rootProject.file('gradle/benchmark-jmh.gradle')
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'org.jdom:jdom2'
+    implementation libs.jdom2
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'jaxen:jaxen'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.jaxen
+    testImplementation libs.bundles.junit
 }
diff --git a/xpath-to-xml-scala/build-2.12.gradle b/xpath-to-xml-scala/build-2.12.gradle
@@ -16,14 +16,12 @@ sourceSets {
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation libraries.scalaLibrary('2.12.15')
-    implementation libraries.scalaReflect('2.12.15')
-    implementation libraries.scalaXml('2.12')
+    implementation libs.scala.library.v212
+    implementation libs.scala.reflect.v212
+    implementation libs.scala.xml.v212
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation libraries.scalatest('2.12')
-    testImplementation 'co.helmethair:scalatest-junit-runner'
-    testImplementation 'org.junit.platform:junit-platform-engine'
+    testImplementation libs.bundles.scalatest.v212
 }
 
 javadocJar {
diff --git a/xpath-to-xml-scala/build-2.13.gradle b/xpath-to-xml-scala/build-2.13.gradle
@@ -16,14 +16,12 @@ sourceSets {
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation libraries.scalaLibrary('2.13.8')
-    implementation libraries.scalaReflect('2.13.8')
-    implementation libraries.scalaXml('2.13')
+    implementation libs.scala.library.v213
+    implementation libs.scala.reflect.v213
+    implementation libs.scala.xml.v213
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation libraries.scalatest('2.13')
-    testImplementation 'co.helmethair:scalatest-junit-runner'
-    testImplementation 'org.junit.platform:junit-platform-engine'
+    testImplementation libs.bundles.scalatest.v213
 }
 
 javadocJar {
diff --git a/xpath-to-xml-scala/build-3.gradle b/xpath-to-xml-scala/build-3.gradle
@@ -16,13 +16,11 @@ sourceSets {
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'org.scala-lang:scala3-library_3:3.1.1'
-    implementation libraries.scalaXml('3')
+    implementation libs.scala.library.v3
+    implementation libs.scala.xml.v3
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation libraries.scalatest('3')
-    testImplementation 'co.helmethair:scalatest-junit-runner'
-    testImplementation 'org.junit.platform:junit-platform-engine'
+    testImplementation libs.bundles.scalatest.v3
 }
 
 javadocJar {
diff --git a/xpath-to-xml-xom/build.gradle b/xpath-to-xml-xom/build.gradle
@@ -5,9 +5,8 @@ apply from: rootProject.file('gradle/benchmark-jmh.gradle')
 dependencies {
     api project(':xpath-to-xml-core')
 
-    implementation 'xom:xom'
+    implementation libs.xom
 
     testImplementation project(':xpath-to-xml-test')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core'
+    testImplementation libs.bundles.junit
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ jmh {`
`6`	`6`
`7`	`7`	`// after gradle 5.3 we need to set this attribute to mark test configuration targeting java 8`
`8`	`8`	`[configurations.jmhCompileClasspath, configurations.jmhRuntimeClasspath].each {`
`9`		`- it.extendsFrom configurations.internal`
`10`	`9`	`it.attributes {`
`11`	`10`	`attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ apply from: rootProject.file('gradle/check-mutationcoverage.gradle')`
`4`	`4`
`5`	`5`	`dependencies {`
`6`	`6`	`testImplementation project(':xpath-to-xml-test')`
`7`		`- testImplementation 'org.junit.jupiter:junit-jupiter'`
`8`		`- testImplementation 'org.mockito:mockito-junit-jupiter'`
`9`		`- testImplementation 'org.assertj:assertj-core'`
	`7`	`+ testImplementation libs.mockito`
	`8`	`+ testImplementation libs.bundles.junit`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ dependencies {`
`6`	`6`	`api project(':xpath-to-xml-core')`
`7`	`7`
`8`	`8`	`testImplementation project(':xpath-to-xml-test')`
`9`		`- testImplementation 'org.junit.jupiter:junit-jupiter'`
`10`		`- testImplementation 'org.mockito:mockito-junit-jupiter'`
`11`		`- testImplementation 'org.assertj:assertj-core'`
	`9`	`+ testImplementation libs.mockito`
	`10`	`+ testImplementation libs.bundles.junit`
`12`	`11`	`}`