Use Gradle library version catalog

CubeLabsNZ · Jul 10, 2022 · 1a97259 · 1a97259
1 parent 79762bf
commit 1a97259
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 108 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,8 +4,8 @@ allprojects {
 }
 
 plugins {
-    DEPENDENCY_VERSIONS
-    NEXUS_PUBLISH
+    alias(libs.plugins.dependency.versions)
+    alias(libs.plugins.nexus.publish)
 }
 
 nexusPublishing {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,3 +5,8 @@ plugins {
 repositories {
     mavenCentral()
 }
+
+dependencies {
+    // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/PluginsHack.kt b/buildSrc/src/main/kotlin/PluginsHack.kt
diff --git a/buildSrc/src/main/kotlin/configurations/Frameworks.kt b/buildSrc/src/main/kotlin/configurations/Frameworks.kt
@@ -1,11 +1,11 @@
 package configurations
 
-import dependencies.Libraries.JUNIT_JUPITER_API
-import dependencies.Libraries.JUNIT_JUPITER_ENGINE
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.plugins.quality.Checkstyle
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.the
 import org.gradle.kotlin.dsl.withType
 
 object Frameworks {
@@ -16,9 +16,11 @@ object Frameworks {
     }
 
     fun Project.configureJUnit5() {
+        val libs = the<LibrariesForLibs>()
+
         dependencies {
-            add("testImplementation", JUNIT_JUPITER_API)
-            add("testRuntimeOnly", JUNIT_JUPITER_ENGINE)
+            add("testImplementation", libs.junit.jupiter.api)
+            add("testRuntimeOnly", libs.junit.jupiter.engine)
         }
 
         tasks.withType<Test> {

diff --git a/buildSrc/src/main/kotlin/configurations/Languages.kt b/buildSrc/src/main/kotlin/configurations/Languages.kt
@@ -15,16 +15,10 @@ object Languages {
         }
     }
 
-    fun Project.attachRepositories() {
-        attachRemoteRepositories()
-    }
-
     fun Project.configureJava() {
-        configure<JavaPluginConvention> {
+        configure<JavaPluginExtension> {
             sourceCompatibility = JavaVersion.VERSION_1_6
-        }
 
-        configure<JavaPluginExtension> {
             withJavadocJar()
             withSourcesJar()
         }

diff --git a/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt b/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt
diff --git a/buildSrc/src/main/kotlin/dependencies/Libraries.kt b/buildSrc/src/main/kotlin/dependencies/Libraries.kt
diff --git a/buildSrc/src/main/kotlin/dependencies/Plugins.kt b/buildSrc/src/main/kotlin/dependencies/Plugins.kt
diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,13 @@
+[versions]
+junit-jupiter = "5.5.2"
+
+[libraries]
+logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.2.10" }
+gwt-exporter = { module = "org.timepedia.exporter:gwtexporter", version = "2.5.1" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+
+[plugins]
+shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
+dependency-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
+nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.1.0" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
diff --git a/scrambles/build.gradle.kts b/scrambles/build.gradle.kts
@@ -1,24 +1,22 @@
-import configurations.Languages.attachRepositories
+import configurations.Languages.attachRemoteRepositories
 import configurations.Languages.configureJava
 import configurations.Frameworks.configureCheckstyle
 import configurations.Frameworks.configureJUnit5
 import configurations.Publications.configureMavenPublication
 import configurations.Publications.configureSignatures
 
-import dependencies.Libraries.GWTEXPORTER
-
 description = "A Java scrambling suite. Java applications can use this project as a library. A perfect example of this is the webscrambles package."
 
-attachRepositories()
-
 plugins {
     `java-library`
     checkstyle
     `maven-publish`
     signing
-    SHADOW
+    alias(libs.plugins.shadow)
 }
 
+attachRemoteRepositories()
+
 configureJava()
 configureCheckstyle()
 configureMavenPublication("lib-scrambles")
@@ -31,7 +29,7 @@ dependencies {
     implementation(project(":threephase"))
     implementation(project(":sq12phase"))
 
-    api(GWTEXPORTER)
+    api(libs.gwt.exporter)
 }
 
 configureJUnit5()
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,15 +1,5 @@
 rootProject.name = "tnoodle-lib"
 
-pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin-multiplatform") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-}
-
 include("min2phase")
 include("scrambles")
 include("sq12phase")

diff --git a/sq12phase/build.gradle.kts b/sq12phase/build.gradle.kts
@@ -2,7 +2,6 @@ import configurations.Languages.attachRemoteRepositories
 import configurations.Languages.configureJava
 import configurations.Publications.configureMavenPublication
 import configurations.Publications.configureSignatures
-import dependencies.Libraries.LOGBACK_CLASSIC
 
 description = "A copy of Chen Shuang's square 1 two phase solver."
 
@@ -19,5 +18,5 @@ configureSignatures(publishing)
 attachRemoteRepositories()
 
 dependencies {
-    implementation(LOGBACK_CLASSIC)
+    implementation(libs.logback.classic)
 }
diff --git a/threephase/build.gradle.kts b/threephase/build.gradle.kts
@@ -2,7 +2,6 @@ import configurations.Languages.attachRemoteRepositories
 import configurations.Languages.configureJava
 import configurations.Publications.configureMavenPublication
 import configurations.Publications.configureSignatures
-import dependencies.Libraries.LOGBACK_CLASSIC
 
 description = "A copy of Chen Shuang's 4x4 scrambler."
 
@@ -20,5 +19,5 @@ attachRemoteRepositories()
 
 dependencies {
     implementation(project(":min2phase"))
-    implementation(LOGBACK_CLASSIC)
+    implementation(libs.logback.classic)
 }