Merge pull request #85 from openapi-processor/kotlin

migrate to kotlin

Author: hauner

.github/workflows/ci.yaml

@@ -27,7 +27,6 @@ jobs:
         distribution: 'temurin'
         java-version: |
           17
-          11
 
     - name: build & publish (sonatype)
       env:
@@ -38,6 +37,6 @@ jobs:
         ORG_GRADLE_PROJECT_signPwd: ${{ secrets.SIGN_PWD }}
         PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
         PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
-      run: ./gradlew build publishToSonatype -s
+      run: ./gradlew build publishToMavenCentral --stacktrace
 
 # -i -d

build.gradle.kts

@@ -1,43 +1,27 @@
 plugins {
     `kotlin-dsl`
-    id("signing")
-    id("openapiprocessor.version")
-    id("openapiprocessor.publish")
+    `maven-publish`
+    signing
+    alias(libs.plugins.pubplug)
     alias(libs.plugins.publish)
-    alias(libs.plugins.nexus)
     alias(libs.plugins.versions)
+    id("compile")
 }
 
-group = projectGroupId()
-version = projectVersion()
-extra["api"] = libs.versions.api.get()
+group = "io.openapiprocessor"
+version = libs.versions.project.get()
 
-allprojects {
-    apply(plugin = "groovy")
-
-    repositories {
-        mavenCentral()
-
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-            content {
-               includeGroup("io.openapiprocessor")
-            }
-            mavenContent {
-                snapshotsOnly()
-            }
-        }
-
-        java {
-            toolchain {
-                languageVersion.set(JavaLanguageVersion.of(11))
-            }
-        }
-    }
+versions {
+    packageName = "io.openapiprocessor.gradle"
+    entries = mapOf(
+        "version" to libs.versions.project.get(),
+        "api" to libs.versions.api.get()
+    )
+}
 
-    dependencies {
-        compileOnly(rootProject.libs.openapi.processor.api)
-        implementation(localGroovy())
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -46,7 +30,6 @@ java {
     withSourcesJar()
 }
 
-@Suppress("UnstableApiUsage")
 testing {
     suites {
         val test by getting(JvmTestSuite::class) {
@@ -75,9 +58,14 @@ testing {
     }
 }
 
-//tasks.updateDaemonJvm {
-//    jvmVersion = JavaVersion.VERSION_17
-//}
+// compile groovy before kotlin
+tasks.compileGroovy {
+    classpath = sourceSets.main.get().compileClasspath
+}
+
+tasks.compileKotlin {
+    libraries.from(sourceSets.main.get().groovy.classesDirectory)
+}
 
 tasks.named<Test>("testInt") {
     shouldRunAfter(tasks.named("test"))
@@ -107,18 +95,14 @@ gradlePlugin {
         create("processorPlugin") {
             id = "io.openapiprocessor.openapi-processor"
             displayName = "Gradle openapi-processor plugin"
-            description = "plugin to run openapi-processor-*, e.g. openapi-processor-spring (requires gradle 7.0+, with gradle 5.5+ use 2021.3)"
+            description = "plugin to run openapi-processor-*, e.g. openapi-processor-spring (requires gradle 7.2+)"
             tags.set(listOf("openapi", "openapi-processor"))
             implementationClass = "io.openapiprocessor.gradle.OpenApiProcessorPlugin"
         }
     }
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = getPublishUser()
-            password = getPublishKey()
-        }
-    }
+publishingCentral {
+    deploymentName = "gradle"
+    waitFor = "VALIDATED"
 }

buildSrc/build.gradle.kts

@@ -2,24 +2,7 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    mavenCentral()
-    maven {
-      url = uri("https://plugins.gradle.org/m2/")
-    }
-}
-
 dependencies {
     // catalog hack: https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
     // compileOnly(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
-
-gradlePlugin {
-    plugins {
-        create("VersionPlugin") {
-            id = "openapiprocessor.version"
-            implementationClass = "VersionPlugin"
-        }
-    }
-}
-

buildSrc/settings.gradle.kts

@@ -1,7 +1,29 @@
+rootProject.name = "buildSrc"
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+//        maven {
+//            url = uri("https://central.sonatype.com/repository/maven-snapshots")
+//        }
+    }
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
+
+    repositories {
+        mavenCentral()
+//        maven {
+//            url = uri("https://central.sonatype.com/repository/maven-snapshots")
+//        }
+//        maven {
+//          url = uri("https://plugins.gradle.org/m2/")
+//        }
+    }
 }

buildSrc/src/main/kotlin/Project.kt

@@ -0,0 +1,10 @@
+// basic compile settings for project and subprojects
+
+plugins {
+    groovy
+}
+
+dependencies {
+    compileOnly("io.openapiprocessor:openapi-processor-api:2024.2")
+    implementation(localGroovy())
+}