Mess around with nmcp

Author: deusaquilus

.github/workflows/ci.yaml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v3

.github/workflows/release.yaml

@@ -13,13 +13,13 @@ jobs:
           - os: ubuntu-latest
             # On ubuntu publish everything you can i.e. the linuxX64 and jvm binaries
             # (Need to do >- or for some reason it preserves a newline after all the entries)
-            publish_command: build publishLinux
+            publish_command: build publishAggregationToCentralPortal
             platform: linux
           - os: macOS-latest
-            publish_command: build publishMac
+            publish_command: build publishAggregationToCentralPortal
             platform: mac
           - os: windows-latest
-            publish_command: build publishWindows
+            publish_command: build publishAggregationToCentralPortal
             platform: windows
     env:
       SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }}
@@ -29,19 +29,14 @@ jobs:
       MATRIX_OS: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v3
       - run: echo "*************** PublishCommand ${{ matrix.publish_command }}"
-
-      - id: create_staging_repo
-        name: Create Central staging repo (Gradle)
-        run: ./gradlew startSonatypeStaging --no-daemon
-
       - name: Publish the project
         shell: bash
         env:
@@ -56,10 +51,10 @@ jobs:
       SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v3
@@ -78,10 +73,10 @@ jobs:
       GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v3

build-logic/src/main/kotlin/conventions-multiplatform.gradle.kts

@@ -20,7 +20,7 @@ kotlin {
   val isMac = platform == "mac"
   val isWindows = platform == "windows"
 
-  jvmToolchain(11)
+  jvmToolchain(17)
   val isLocalMultiplatform = project.hasProperty("isLocalMultiplatform")
 
   jvm {

build-logic/src/main/kotlin/publish-jvm.gradle.kts

@@ -22,16 +22,16 @@ repositories {
 tasks {
   compileKotlin {
     kotlinOptions.suppressWarnings = true
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
   }
 
   compileJava {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
   }
 
   compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
   }
 
   compileTestJava {
@@ -40,14 +40,14 @@ tasks {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 // Can also do this instead of above, for more details
 // see here: https://stackoverflow.com/questions/69079963/how-to-set-compilejava-task-11-and-compilekotlin-task-1-8-jvm-target-com
 //  java {
-//    toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+//    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 //  }
 
 // Disable publishing for decomat examples
@@ -93,7 +93,7 @@ publishing {
       setUrl {
         val repositoryId = System.getenv("STAGING_REPO_ID")
         if (repositoryId.trim().isEmpty() || repositoryId.trim() == "") error("STAGING_REPO_ID is empty")
-        "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deployByRepositoryId/$repositoryId/"
+        "https://ossrh-staging-api.central.sonatype.com/service/local/staging/maven2/"
       }
       credentials {
         username = user

build-logic/src/main/kotlin/publish.gradle.kts

@@ -8,6 +8,7 @@ plugins {
   signing
   id("io.github.gradle-nexus.publish-plugin")
   id("org.jetbrains.dokka")
+  //id("com.gradleup.nmcp.aggregation")
 }
 
 apply(plugin = "io.github.gradle-nexus.publish-plugin")
@@ -18,16 +19,29 @@ repositories {
 }
 
 
+//nmcpAggregation {
+//  centralPortal {
+//    username = System.getenv("SONATYPE_USERNAME")   ?: error("SONATYPE_USERNAME not set")
+//    password = System.getenv("SONATYPE_PASSWORD")   ?: error("SONATYPE_PASSWORD not set")
+//    // publish manually from the portal
+//    publishingType = "USER_MANAGED"
+//  }
+//
+//  // Publish all projects that apply the 'maven-publish' plugin
+//  publishAllProjectsProbablyBreakingProjectIsolation()
+//}
+
+
 // Disable publishing for testing project
 tasks.withType<PublishToMavenRepository>().configureEach {
   gradle.startParameter.maxWorkerCount = 1
 
-  if (HostManager.hostIsMac) {
-    doLast {
-      logger.lifecycle("Sleeping 120 s after $name")
-      Thread.sleep(20_000)
-    }
-  }
+  //if (HostManager.hostIsMac) {
+  //  doLast {
+  //    logger.lifecycle("Sleeping 120 s after $name")
+  //    Thread.sleep(20_000)
+  //  }
+  //}
 
   onlyIf {
     publication.artifactId != "testing"
@@ -55,7 +69,7 @@ publishing {
       setUrl {
         val repositoryId = System.getenv("STAGING_REPO_ID")
         if (repositoryId.trim().isEmpty() || repositoryId.trim() == "") error("STAGING_REPO_ID is empty")
-        "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deployByRepositoryId/$repositoryId/"
+        "https://ossrh-staging-api.central.sonatype.com/service/local/staging/maven2/"
       }
       credentials {
         username = user
@@ -154,7 +168,6 @@ tasks.withType<Sign>().configureEach {
 // I tried a few things that caused other issues. Ultimately the working solution I got from here:
 // https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
 tasks.withType<AbstractPublishToMaven>().configureEach {
-  gradle.startParameter.maxWorkerCount = 1
   val signingTasks = tasks.withType<Sign>()
   mustRunAfter(signingTasks)
 

build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
   id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false
 }
 
+
 allprojects {
     repositories {
         mavenCentral()

gradle.properties

@@ -1,3 +1,7 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.configureondemand=false
 org.gradle.workers.max=1
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=true
+org.gradle.toolchains.foojay-resolver-convention.version=0.7.0
+kotlin.jvm.target.validation.mode=ignore

settings.gradle.kts

@@ -1,6 +1,15 @@
 pluginManagement {
   includeBuild("terpal-plugin-gradle")
   includeBuild("build-logic")
+
+  pluginManagement {
+    repositories {
+      mavenCentral()
+      google()
+      gradlePluginPortal()
+      mavenLocal()
+    }
+  }
 }
 
 includeBuild("terpal-runtime")

terpal-plugin-gradle/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 val conventionsDecomatVersion = Conventions_gradle.Versions.decomatVersion

terpal-plugin-kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
@@ -18,13 +18,13 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEa
         // Otherwise will have: Could not resolve io.exoquery:pprint-kotlin:2.0.1.
         // Incompatible because this component declares a component, compatible with Java 11 and the consumer needed a component, compatible with Java 8
         java {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
         // If I remove this I get:
         //  'compileJava' task (current target is 11) and 'kaptGenerateStubsKotlin' task (current target is 1.8) jvm target compatibility should be set to the same Java version.
         // Not sure why
-        jvmTarget.set(JvmTarget.JVM_11)
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }