From c0f48f0413bad4e380a2c54774c56d4df38d8da4 Mon Sep 17 00:00:00 2001 From: topi314 Date: Thu, 5 Jun 2025 01:47:44 +0200 Subject: [PATCH 1/3] update to central portal --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 12 ++++++------ build.gradle.kts | 10 +++++----- settings.gradle.kts | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a028b80..d374ea2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,8 @@ jobs: build: runs-on: ubuntu-latest env: - MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }} ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3850b3..5d675ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,12 +8,12 @@ jobs: build: uses: ./.github/workflows/build.yml secrets: - MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }} - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }} - ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }} + ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} release: needs: build diff --git a/build.gradle.kts b/build.gradle.kts index 757c398..523b391 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -164,11 +164,11 @@ val mavenUrl: String publishing { repositories { maven { - name = "arbjerg" + name = "lavalink" url = uri(mavenUrl) credentials { - username = System.getenv("MAVEN_USERNAME") - password = System.getenv("MAVEN_PASSWORD") + username = findProperty("MAVEN_USERNAME") as String? + password = findProperty("MAVEN_PASSWORD") as String? } authentication { create("basic") @@ -190,7 +190,7 @@ afterEvaluate { coordinates(group.toString(), project.the().archivesName.get(), version.toString()) if (findProperty("mavenCentralUsername") != null && findProperty("mavenCentralPassword") != null) { - publishToMavenCentral(SonatypeHost.S01, false) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, false) if (release) { signAllPublications() } @@ -234,7 +234,7 @@ publish.apply { dependsOn(tasks.build) onlyIf { - System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null + findProperty("MAVEN_USERNAME") != null && findProperty("MAVEN_PASSWORD") != null } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 8931085..a74af10 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,7 @@ fun VersionCatalogBuilder.versionRefs() { version("kotlin", "1.9.21") version("dokka", "1.9.10") version("grgit", "5.2.0") - version("maven-publish", "0.25.3") + version("maven-publish", "0.28.0") version("lavalink", "4.0.3") version("logger", "2.0.7") From d6a44938523681e43faa213d87e0997e4d6f9fe7 Mon Sep 17 00:00:00 2001 From: topi314 Date: Thu, 5 Jun 2025 10:49:27 +0200 Subject: [PATCH 2/3] update maven publish plugin to support central portal snapshots --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index a74af10..f46144a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,7 @@ fun VersionCatalogBuilder.versionRefs() { version("kotlin", "1.9.21") version("dokka", "1.9.10") version("grgit", "5.2.0") - version("maven-publish", "0.28.0") + version("maven-publish", "0.32.0") version("lavalink", "4.0.3") version("logger", "2.0.7") From 154dd77e49cd4289009a59a9c5301f7dff70e69d Mon Sep 17 00:00:00 2001 From: topi314 Date: Thu, 5 Jun 2025 22:18:23 +0200 Subject: [PATCH 3/3] add dependsOn to GenerateModuleMetadata --- build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 523b391..808f0a2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -140,6 +140,11 @@ tasks.withType { dependsOn(tasks.kotlinSourcesJar) } +tasks.withType { + dependsOn(sourcesJar) + dependsOn(tasks.kotlinSourcesJar) +} + kotlin { jvmToolchain(17) }