consolidate versions

Author: pschichtel

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
       - name: Setup Gradle

build.gradle.kts

@@ -1,9 +1,10 @@
+import io.github.zenhelix.gradle.plugin.task.PublishBundleMavenCentralTask
 import pl.allegro.tech.build.axion.release.domain.PredefinedVersionCreator
 
 plugins {
     `maven-publish`
-    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-    id("pl.allegro.tech.build.axion-release") version "1.18.16"
+    alias(libs.plugins.axion)
+    alias(libs.plugins.mavenCentralPublish) apply false
 }
 
 description = "JavaCAN is a binding to Linux' socketcan subsystem that feels native to Java developers."
@@ -26,12 +27,6 @@ allprojects {
     version = gitVersion
 }
 
-nexusPublishing {
-    this.repositories {
-        sonatype()
-    }
-}
-
 val publishAllToMavenLocal by tasks.registering(DefaultTask::class) {
     group = "publishing"
 
@@ -59,11 +54,20 @@ val mavenCentralDeploy by tasks.registering(DefaultTask::class) {
     group = "publishing"
     val isSnapshot = project.version.toString().endsWith("-SNAPSHOT")
 
-    val publishTasks = subprojects
-        .flatMap { it.tasks.withType<PublishToMavenRepository>() }
-        .filter { it.repository.name == "sonatype" }
-    dependsOn(publishTasks)
-    if (!isSnapshot) {
-        dependsOn(tasks.closeAndReleaseStagingRepositories)
+    if (isSnapshot) {
+        logger.lifecycle("Snapshot deployment!")
+        for (project in allprojects) {
+            val tasks = project.tasks
+                .withType<PublishToMavenRepository>()
+                .matching { it.repository.name == "mavenCentralSnapshots" }
+            dependsOn(tasks)
+        }
+    } else {
+        logger.lifecycle("Release deployment!")
+        for (project in allprojects) {
+            val tasks = project.tasks
+                .withType<PublishBundleMavenCentralTask>()
+            dependsOn(tasks)
+        }
     }
 }

conventions/build.gradle.kts

@@ -8,8 +8,9 @@ repositories {
 }
 
 dependencies {
-    api(plugin("tel.schich.dockcross", version = "0.2.3"))
-    implementation("io.github.zenhelix.maven-central-publish:io.github.zenhelix.maven-central-publish.gradle.plugin:0.8.0")
+    api(plugin(libs.plugins.dockcross))
+    implementation(plugin(libs.plugins.mavenCentralPublish))
 }
 
-fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
+fun plugin(plugin: Provider<PluginDependency>) =
+    plugin.map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" }

conventions/settings.gradle.kts

@@ -5,6 +5,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("dev.panuszewski.typesafe-conventions") version "0.7.4"
+}
+
 dependencyResolutionManagement {
     repositories {
         mavenCentral()

conventions/src/main/kotlin/tel.schich.javacan.convention.base.gradle.kts

@@ -28,14 +28,12 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.eclipse.jdt:org.eclipse.jdt.annotation:2.3.100")
-    implementation("org.slf4j:slf4j-api:2.0.16")
+    compileOnly(libs.jdtAnnotations)
+    implementation(libs.slf4j)
 
-    testImplementation("ch.qos.logback:logback-classic:1.3.14")
+    testImplementation(libs.logbackClassic)
 
-    "org.junit.jupiter:junit-jupiter-engine:5.11.3".also {
-        testFixturesImplementation(it)
-        testImplementation(it)
-    }
+    testFixturesImplementation(libs.junitJupiter)
+    testImplementation(libs.junitJupiter)
 }
 

conventions/src/main/kotlin/tel.schich.javacan.convention.native.gradle.kts

@@ -189,10 +189,8 @@ tasks.test {
 }
 
 dependencies {
-    "tel.schich:jni-access-generator:1.1.8".also {
-        annotationProcessor(it)
-        compileOnly(it)
-    }
+    annotationProcessor(libs.jniAccessGenerator)
+    compileOnly(libs.jniAccessGenerator)
 
     files(packageNativeForHost).also {
         testImplementation(it)

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fd88a209e0f18ca6eaf97d9fa9e45e01/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/1543f336911ae3d7d37bedec8b74d98c/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fd88a209e0f18ca6eaf97d9fa9e45e01/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/1543f336911ae3d7d37bedec8b74d98c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7799fb2cb9f9eb382df2b8b6fb793b77/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/99a42fd36e2e41c7c8ed49f423f49fdf/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fd88a209e0f18ca6eaf97d9fa9e45e01/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/1543f336911ae3d7d37bedec8b74d98c/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3087f28f30be41ab6818c16a488f5f8a/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/638dfeab250dbbb0639b82816307982e/redirect
+toolchainVersion=21

gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+axion = "1.18.16"
+dockcross = "0.2.3"
+mavenCentralPublish = "0.8.0"
+jdtAnnotations = "2.3.100"
+slf4j = "2.0.16"
+logback = "1.3.14"
+junitJupiter = "5.11.3"
+jniAccessGenerator = "1.1.8"
+
+[libraries]
+jdtAnnotations = { module = "org.eclipse.jdt:org.eclipse.jdt.annotation", version.ref = "jdtAnnotations" }
+slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+logbackClassic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
+junitJupiter = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" }
+jniAccessGenerator = { module = "tel.schich:jni-access-generator", version.ref = "jniAccessGenerator" }
+
+[plugins]
+axion = { id = "pl.allegro.tech.build.axion-release", version.ref = "axion" }
+dockcross = { id = "tel.schich.dockcross", version.ref = "dockcross" }
+mavenCentralPublish = { id = "io.github.zenhelix.maven-central-publish", version.ref = "mavenCentralPublish" }

settings.gradle.kts

@@ -1,11 +1,11 @@
 rootProject.name = "javacan"
 
+includeBuild("conventions")
 pluginManagement {
-    includeBuild("conventions")
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 include("core")