improve build

Author: hauner

build.gradle.kts

@@ -1,17 +1,12 @@
 plugins {
     java
     alias(libs.plugins.jacoco)
-    alias(libs.plugins.nexus)
 }
 
 group = "io.openapiprocessor"
 version = libs.versions.processor.get()
 println("version: $version")
 
-repositories {
-    mavenCentral()
-}
-
 // do not create jar for the root project
 tasks.named("jar") { enabled = false }
 
@@ -23,21 +18,3 @@ tasks.named("jacocoLogAggregatedCoverage") {
 tasks.named("build") {
     dependsOn ("jacocoLogAggregatedCoverage")
 }
-
-extra["publishUser"] = buildProperty("PUBLISH_USER")
-extra["publishKey"] = buildProperty("PUBLISH_KEY")
-val publishUser: String by extra
-val publishKey: String by extra
-
-nexusPublishing {
-    this.repositories {
-        sonatype {
-            username.set(publishUser)
-            password.set(publishKey)
-
-            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
-        }
-    }
-}
-

buildSrc/build.gradle.kts

@@ -1,15 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     `kotlin-dsl`
-//    `java-gradle-plugin`
-}
-
-repositories {
-    mavenCentral()
-    maven {
-      url = uri("https://plugins.gradle.org/m2/")
-    }
 }
 
 dependencies {
@@ -19,13 +9,5 @@ dependencies {
     implementation(libs.plugin.kotlin)
     implementation(libs.plugin.checker)
     implementation(libs.plugin.outdated)
-}
-
-gradlePlugin {
-    plugins {
-        create("VersionPlugin") {
-            id = "openapiprocessor.version"
-            implementationClass = "VersionPlugin"
-        }
-    }
+    implementation(libs.plugin.build)
 }

buildSrc/settings.gradle.kts

@@ -1,7 +1,25 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
+
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        maven {
+            url = uri("https://central.sonatype.com/repository/maven-snapshots")
+            mavenContent {
+                snapshotsOnly()
+            }
+        }
+    }
 }

buildSrc/src/main/groovy/VersionPlugin.groovy

@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.withType
 plugins {
     `java-library`
     jacoco
-
     id("org.jetbrains.kotlin.jvm")
     id("com.github.ben-manes.versions")
 }
@@ -25,12 +24,16 @@ java {
 
 kotlin {
     jvmToolchain(libs.versions.build.jdk.get().toInt())
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
+    }
 }
 
 repositories {
     mavenCentral()
     maven {
-        url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+        url = uri("https://central.sonatype.com/repository/maven-snapshots")
         mavenContent {
             snapshotsOnly()
         }

buildSrc/src/main/groovy/VersionTask.groovy

@@ -1,76 +1,33 @@
+import io.openapiprocessor.build.core.dsl.initFrom
+import io.openapiprocessor.build.core.dsl.initSignKey
+import io.openapiprocessor.build.core.dsl.sonatype
+import io.openapiprocessor.build.core.getPomProperties
 import org.gradle.accessors.dm.LibrariesForLibs
 
 plugins {
-    id("maven-publish")
-    id("signing")
+   id("io.openapiprocessor.build.plugin.publish-central")
 }
 
-// see buildSrc/build.gradle catalog hack
+// see buildSrc/build.gradle.kts
 val libs = the<LibrariesForLibs>()
 
-fun properties(key: String): Provider<String> = providers.gradleProperty(key)
-val componentName = if (isPlatform()) { "javaPlatform" } else { "java" }
-
 publishing {
     publications {
         create<MavenPublication>("openapiprocessor") {
-            from(components[componentName])
+            from(components["java"])
 
             pom {
-                group = "io.openapiprocessor"
-                version = libs.versions.processor.get()
-
-                name.set("openapi-processor")
-                description.set("OpenAPI Processor")
-                url.set("https://openapiprocessor.io")
-
-                licenses {
-                    license {
-                        name.set("The Apache License, Version 2.0")
-                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
-                        distribution.set("repo")
-                    }
-                }
-
-                developers {
-                    developer {
-                        id.set("hauner")
-                        name.set("Martin Hauner")
-                    }
-                }
-
-                scm {
-                   url.set("https://github.com/openapi-processor/openapi-processor-base")
-                }
+                pom.initFrom(getPomProperties(project))
             }
         }
     }
 
     repositories {
-        maven {
-            val releasesRepoUrl = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2"
-            val snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots"
-            url = uri(if (isReleaseVersion()) releasesRepoUrl else snapshotsRepoUrl)
-
-            credentials {
-                username = buildProperty("PUBLISH_USER")
-                password = buildProperty("PUBLISH_KEY")
-            }
-        }
+        sonatype(project)
     }
 }
 
-// signing requires the sign key and pwd as environment variables:
-//
-// ORG_GRADLE_PROJECT_signKey=...
-// ORG_GRADLE_PROJECT_signPwd=...
-
 signing {
-    setRequired({ gradle.taskGraph.hasTask("${project.path}:publishToSonatype") })
-
-    val signKey: String? by project
-    val signPwd: String? by project
-    useInMemoryPgpKeys(signKey, signPwd)
-
+    initSignKey()
     sign(publishing.publications["openapiprocessor"])
 }

buildSrc/src/main/kotlin/Project.kt

@@ -4,6 +4,8 @@ import org.gradle.accessors.dm.LibrariesForLibs
 
 plugins {
     java
+    groovy
+    kotlin
 }
 
 // see buildSrc/build.gradle.kts

buildSrc/src/main/kotlin/openapiprocessor.library.gradle.kts

@@ -1,3 +1,12 @@
+projectGroupId=io.openapiprocessor
+
+projectUrl=https://openapiprocessor.io
+projectTitle=openapi-processor
+projectDesc=OpenAPI Processor
+projectRepo=openapi-processor/openapi-processor-base
+
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
 org.gradle.warning.mode=all
 
 org.gradle.jvmargs = -Xmx1g -Xms256m -XX:MaxMetaspaceSize=512m \