update build & dependencies

Author: hauner

.github/workflows/build.yaml

@@ -33,7 +33,6 @@ jobs:
         distribution: 'temurin'
         java-version: |
           17
-          11
 
     - name: set up gradle
       uses: gradle/actions/setup-gradle@v4
@@ -67,14 +66,15 @@ jobs:
         distribution: 'temurin'
         java-version: |
           17
-          11
 
     - name: set up gradle
       uses: gradle/actions/setup-gradle@v4
 
     - name: publish snapshot
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ORG_GRADLE_PROJECT_signKey: ${{ secrets.SIGN_KEY_ORG }}
+        ORG_GRADLE_PROJECT_signPwd: ${{ secrets.SIGN_PWD }}
         SIGN_KEY: ${{ secrets.SIGN_KEY_ORG }}
         SIGN_PWD: ${{ secrets.SIGN_PWD }}
         PUBLISH_USER: ${{ secrets.PUBLISH_USER }}

.github/workflows/release.yaml

@@ -21,7 +21,6 @@ jobs:
           distribution: 'temurin'
           java-version: |
             17
-            11
 
       - name: set up gradle
         uses: gradle/actions/setup-gradle@v4
@@ -30,6 +29,8 @@ jobs:
         env:
           PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
           PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+          ORG_GRADLE_PROJECT_signKey: ${{ secrets.SIGN_KEY_ORG }}
+          ORG_GRADLE_PROJECT_signPwd: ${{ secrets.SIGN_PWD }}
           SIGN_KEY: ${{ secrets.SIGN_KEY_ORG }}
           SIGN_PWD: ${{ secrets.SIGN_PWD }}
         run: |

build.gradle renamed to build.gradle.kts

@@ -1,66 +1,26 @@
 plugins {
-    id 'jacoco'
-    id 'groovy'
-    id 'java-library'
-    id 'maven-publish'
-    id 'signing'
-    alias(libs.plugins.kotlin)
-    alias(libs.plugins.sonar)
-    alias(libs.plugins.nexus)
+    `java-library`
+    groovy
+    kotlin
+    jacoco
     alias(libs.plugins.versions)
+    alias(libs.plugins.sonar)
+    alias(libs.plugins.updates)
+    id("openapiprocessor.test")
+    id("openapiprocessor.testInt")
+    id("openapiprocessor.publish")
+    id("jacoco-report-aggregation")
 }
 
-group projectGroupId
-version projectVersion
-
-repositories {
-    mavenLocal ()
-    mavenCentral ()
-    maven {
-        url = "https://central.sonatype.com/repository/maven-snapshots"
-    }
-}
-
-testing {
-    suites {
-        test {
-            useJUnitJupiter(libs.versions.junit.get())
-        }
-
-        testInt(JvmTestSuite) {
-            useJUnitJupiter(libs.versions.junit.get())
-
-            dependencies {
-                implementation(project())
-            }
-
-            sources {
-                java {
-                    srcDirs = ['src/testInt/kotlin']
-                }
-            }
-
-            targets {
-                all {
-                    testTask.configure {
-                        shouldRunAfter(test)
-                    }
-                }
-            }
-        }
-    }
-}
-
-tasks.named('check') {
-    dependsOn(testing.suites.testInt)
-}
+group = "io.openapiprocessor"
+version = libs.versions.processor.get()
+println("version: $version")
 
-sourceSets {
-  main {
-    java {
-        srcDirs "${buildDir}/version"
-    }
-  }
+versions {
+    packageName = "io.openapiprocessor.micronaut"
+    entries.putAll(mapOf(
+        "version" to libs.versions.processor.get()
+    ))
 }
 
 java {
@@ -69,28 +29,18 @@ java {
 }
 
 kotlin {
-    jvmToolchain(libs.versions.build.jdk.get() as Integer)
-}
+    jvmToolchain(libs.versions.build.jdk.get().toInt())
 
-compileKotlin.dependsOn "generateVersion"
-
-compileTestGroovy {
-    dependsOn 'compileKotlin'
-    classpath += files(compileKotlin.destinationDirectory)
-}
-
-kotlin {
-    jvmToolchain {
-        jvmToolchain(libs.versions.build.jdk.get() as Integer)
+    compilerOptions {
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
     }
 }
 
-tasks.named('compileKotlin') {
-    dependsOn 'generateVersion'
-}
 
-tasks.named('sourcesJar') {
-    dependsOn 'generateVersion'
+tasks.compileTestGroovy {
+    classpath += sourceSets.main.get().compileClasspath
+    classpath += files(tasks.compileKotlin.get().destinationDirectory)
+    classpath += files(tasks.compileTestKotlin.get().destinationDirectory)
 }
 
 dependencies {
@@ -109,7 +59,7 @@ dependencies {
     testImplementation (libs.openapi.processor.parser.api)
     testImplementation (libs.openapi.processor.parser.swagger)
     testImplementation (libs.openapi.processor.parser.openapi4j)
-    testImplementation platform(libs.groovy.bom)
+    testImplementation (platform(libs.groovy.bom))
     testImplementation ("org.apache.groovy:groovy")
     testImplementation ("org.apache.groovy:groovy-nio")
     testImplementation (libs.spock)
@@ -127,7 +77,7 @@ dependencies {
     testIntImplementation (libs.openapi.processor.parser.api)
     testIntImplementation (libs.openapi.processor.parser.swagger)
     testIntImplementation (libs.openapi.processor.parser.openapi4j)
-    testIntImplementation platform(libs.groovy.bom)
+    testIntImplementation (platform(libs.groovy.bom))
     testIntImplementation ("org.apache.groovy:groovy")
     testIntImplementation ("org.apache.groovy:groovy-nio")
     testIntImplementation (libs.spock)
@@ -141,55 +91,54 @@ dependencies {
     testIntImplementation (libs.micronaut.data)
 }
 
-tasks.named("dependencyUpdates").configure {
-    rejectVersionIf {
-        String v = it.candidate.version
-        println "candidate: $v"
-        return v.endsWith ("-M1") || v.contains ("alpha") || v.contains ("beta")
-    }
-}
+//tasks.named("dependencyUpdates").configure {
+//    rejectVersionIf {
+//        String v = it.candidate.version
+//        println "candidate: $v"
+//        return v.endsWith ("-M1") || v.contains ("alpha") || v.contains ("beta")
+//    }
+//}
 
-tasks.withType(Test).configureEach {
-    jvmArgs(
+tasks.withType<Test>().configureEach {
+    jvmArgs(listOf(
         "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
         "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
         "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
         "--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
         "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
         "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-    )
+    ))
 
     javaLauncher.set(javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(libs.versions.test.jdk.get()))
     })
 
-    finalizedBy jacocoTestReport
+    finalizedBy(tasks.named("jacocoTestReport"))
 }
 
-
 jacoco {
     toolVersion = libs.versions.jacoco.get()
 }
 
-jacocoTestReport {
+tasks.jacocoTestReport {
+    executionData.from(tasks.named<Test>("test").map<File> {
+        it.extensions.getByType(JacocoTaskExtension::class.java).destinationFile as File
+    })
+    executionData.from(tasks.named<Test>("testInt").map<File> {
+        it.extensions.getByType(JacocoTaskExtension::class.java).destinationFile as File
+    })
+
     reports {
         xml.required = true
-        html.required = false
-        csv.required = false
+        html.required = true
     }
-
-    getExecutionData().setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
 }
 
 sonarqube {
   properties {
-    property "sonar.projectKey", "openapi-processor_openapi-processor-micronaut"
-    property "sonar.organization", "openapi-processor"
-    property "sonar.host.url", "https://sonarcloud.io"
-    property "sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacocoTestReport.xml"
+    property("sonar.projectKey", "openapi-processor_openapi-processor-micronaut")
+    property("sonar.organization", "openapi-processor")
+    property("sonar.host.url", "https://sonarcloud.io")
+    property("sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.dir("reports/jacoco/test/jacocoTestReport.xml").get().toString())
   }
 }
-
-apply plugin: VersionPlugin
-apply from: "${rootProject.rootDir}/gradle/publishing.gradle"
-apply from: "${rootProject.rootDir}/gradle/publishing.tasks.gradle.kts"

buildSrc/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    // catalog hack: https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+
+    implementation(libs.plugin.kotlin)
+//    implementation(libs.plugin.checker)
+//    implementation(libs.plugin.updates)
+    implementation(libs.plugin.build)
+}

buildSrc/settings.gradle.kts

@@ -0,0 +1,27 @@
+@file:Suppress("UnstableApiUsage", "UNUSED_VARIABLE")
+
+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()
+            }
+        }
+    }
+}