From e282cc2e0d8ec14454196b11eb578be8edd628c2 Mon Sep 17 00:00:00 2001 From: Paul Kindler Date: Wed, 7 May 2025 15:06:49 +0200 Subject: [PATCH 01/26] update to new (hopefully correct) action --- .github/workflows/publishing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index bf207239..94577a5a 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -14,7 +14,7 @@ jobs: java-version: "21" - name: Setup Gradle - uses: gradle/actions/setup-gradle@4.2.2 + uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build run: ./gradlew build @@ -23,4 +23,4 @@ jobs: run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish to Modrinth - run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} + run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file From 082c7367a474d30838718d80b152efb009c3c27f Mon Sep 17 00:00:00 2001 From: Paul Kindler Date: Wed, 7 May 2025 16:22:31 +0200 Subject: [PATCH 02/26] fix paper requiring current version of other modules --- .github/workflows/publishing.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 94577a5a..68542d0f 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -19,8 +19,23 @@ jobs: - name: Execute Gradle build run: ./gradlew build - - name: Publish to Ossrh - run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + - name: Publish commands to Ossrh + run: ./gradlew :silk-commands:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish core to Ossrh + run: ./gradlew :silk-core:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish game to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish igui to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish network to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish paper to Ossrh + run: ./gradlew :silk-paper:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish to Modrinth run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file From fcf889af6f18c3e3d1852bcd578bb5da9e8bd8bc Mon Sep 17 00:00:00 2001 From: Paul Kindler Date: Wed, 7 May 2025 16:26:04 +0200 Subject: [PATCH 03/26] Revert "fix paper requiring current version of other modules" This reverts commit 082c7367a474d30838718d80b152efb009c3c27f. --- .github/workflows/publishing.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 68542d0f..94577a5a 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -19,23 +19,8 @@ jobs: - name: Execute Gradle build run: ./gradlew build - - name: Publish commands to Ossrh - run: ./gradlew :silk-commands:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish core to Ossrh - run: ./gradlew :silk-core:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish game to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish igui to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish network to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish paper to Ossrh - run: ./gradlew :silk-paper:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + - name: Publish to Ossrh + run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish to Modrinth run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file From 31c41fc5bb40e64813b5da5fe40ce750aa904dd4 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 16:49:57 +0200 Subject: [PATCH 04/26] remove silk-paper from settings.gradle.kts --- .github/workflows/publishing.yml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 94577a5a..cbc3656e 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -14,7 +14,7 @@ jobs: java-version: "21" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build run: ./gradlew build diff --git a/settings.gradle.kts b/settings.gradle.kts index a4d32d17..e8dd6333 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,6 +19,6 @@ include("$projectName-nbt") include("$projectName-network") include("$projectName-persistence") -include("$projectName-paper") +//include("$projectName-paper") include("$projectName-testmod") From d26db9111f92f541d66ef33a3301c44ff03b0b3a Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 17:07:36 +0200 Subject: [PATCH 05/26] fix missing toolchain java version, fix incorrect test --- buildSrc/build.gradle.kts | 6 ++++++ .../test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4a7f5bdd..6d38ff52 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,6 +11,12 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } +} + dependencies { fun pluginDep(id: String, version: String) = "${id}:${id}.gradle.plugin:${version}" diff --git a/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt b/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt index 8b3d2758..b7d17c0e 100644 --- a/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt +++ b/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt @@ -31,9 +31,9 @@ class NbtEncodingTest : StringSpec({ element.getInt("x") shouldBe value.x element.getLong("y") shouldBe value.y element.getString("name") shouldBe value.name - element.getList("stringList", Tag.TAG_STRING.toInt()).map { it.asString } shouldBe value.stringList + element.getList("stringList").map { it.asString() } shouldBe value.stringList element.getLongArray("longSet") shouldBe value.longSet.toLongArray() - with(element.getCompound("inner")) { + with(element.getCompound("inner").get()) { size() shouldBe 1 getBoolean("test") shouldBe value.inner.test } @@ -109,7 +109,8 @@ class NbtEncodingTest : StringSpec({ checkAll(Exhaustive.enum()) { val element = Nbt.encodeToNbtElement(it) element.shouldBeInstanceOf() - element.asString shouldBe it.name + + element.asString() shouldBe it.name } } @@ -118,7 +119,7 @@ class NbtEncodingTest : StringSpec({ val element = Nbt.encodeToNbtElement(value) element.shouldBeInstanceOf() element.getString("type") shouldBe "child1" - with(element.getCompound("value")) { + with(element.getCompound("value").get()) { getFloat("baseVal") shouldBe value.baseVal getDouble("childProp") shouldBe value.childProp } From 3106c03df7f97e1e855b9ec22a9e34780603b863 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 21:37:51 +0200 Subject: [PATCH 06/26] add --stacktrace for more information --- .github/workflows/publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index cbc3656e..a9fa9532 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -17,7 +17,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build - run: ./gradlew build + run: ./gradlew build --stacktrace - name: Publish to Ossrh run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} From 5067615bf62657ba051fed027587ad6bd54778fd Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 21:48:57 +0200 Subject: [PATCH 07/26] add more memory to actual task --- .github/workflows/publishing.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index a9fa9532..318b8e9c 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -17,6 +17,8 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build + env: + GRADLE_OPTS: -Xmx4g run: ./gradlew build --stacktrace - name: Publish to Ossrh From 3711f3dbe0ef4c63136c37793c6c7f5f1fbb4756 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 21:57:03 +0200 Subject: [PATCH 08/26] give more memory to any jvm based task --- .github/workflows/publishing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 318b8e9c..4d9adc00 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -18,8 +18,8 @@ jobs: - name: Execute Gradle build env: - GRADLE_OPTS: -Xmx4g - run: ./gradlew build --stacktrace + JAVA_TOOL_OPTIONS: -Xmx4g + run: ./gradlew build --stacktrace --no-daemon - name: Publish to Ossrh run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} From 3e7296bb54a43b9d571878b2120bc9894e480f11 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 09/26] Revert "give more memory to any jvm based task" This reverts commit 3711f3dbe0ef4c63136c37793c6c7f5f1fbb4756. --- .github/workflows/publishing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 4d9adc00..318b8e9c 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -18,8 +18,8 @@ jobs: - name: Execute Gradle build env: - JAVA_TOOL_OPTIONS: -Xmx4g - run: ./gradlew build --stacktrace --no-daemon + GRADLE_OPTS: -Xmx4g + run: ./gradlew build --stacktrace - name: Publish to Ossrh run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} From c8ec8c377b07ace40bdf6ca0173519fd986cb973 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 10/26] Revert "add more memory to actual task" This reverts commit 5067615bf62657ba051fed027587ad6bd54778fd. --- .github/workflows/publishing.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 318b8e9c..a9fa9532 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -17,8 +17,6 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build - env: - GRADLE_OPTS: -Xmx4g run: ./gradlew build --stacktrace - name: Publish to Ossrh From 73ec22a1f061c998523385a0912e65fee29a390a Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 11/26] Revert "add --stacktrace for more information" This reverts commit 3106c03df7f97e1e855b9ec22a9e34780603b863. --- .github/workflows/publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index a9fa9532..cbc3656e 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -17,7 +17,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build - run: ./gradlew build --stacktrace + run: ./gradlew build - name: Publish to Ossrh run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} From 21f12e05adda3c2af4737cd2a01c30948ed0b91c Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 12/26] Revert "fix missing toolchain java version, fix incorrect test" This reverts commit d26db9111f92f541d66ef33a3301c44ff03b0b3a. --- buildSrc/build.gradle.kts | 6 ------ .../test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt | 9 ++++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6d38ff52..4a7f5bdd 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,12 +11,6 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} - dependencies { fun pluginDep(id: String, version: String) = "${id}:${id}.gradle.plugin:${version}" diff --git a/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt b/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt index b7d17c0e..8b3d2758 100644 --- a/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt +++ b/silk-nbt/src/test/kotlin/net/silkmc/silk/nbt/NbtEncodingTest.kt @@ -31,9 +31,9 @@ class NbtEncodingTest : StringSpec({ element.getInt("x") shouldBe value.x element.getLong("y") shouldBe value.y element.getString("name") shouldBe value.name - element.getList("stringList").map { it.asString() } shouldBe value.stringList + element.getList("stringList", Tag.TAG_STRING.toInt()).map { it.asString } shouldBe value.stringList element.getLongArray("longSet") shouldBe value.longSet.toLongArray() - with(element.getCompound("inner").get()) { + with(element.getCompound("inner")) { size() shouldBe 1 getBoolean("test") shouldBe value.inner.test } @@ -109,8 +109,7 @@ class NbtEncodingTest : StringSpec({ checkAll(Exhaustive.enum()) { val element = Nbt.encodeToNbtElement(it) element.shouldBeInstanceOf() - - element.asString() shouldBe it.name + element.asString shouldBe it.name } } @@ -119,7 +118,7 @@ class NbtEncodingTest : StringSpec({ val element = Nbt.encodeToNbtElement(value) element.shouldBeInstanceOf() element.getString("type") shouldBe "child1" - with(element.getCompound("value").get()) { + with(element.getCompound("value")) { getFloat("baseVal") shouldBe value.baseVal getDouble("childProp") shouldBe value.childProp } From 3c54c4ab63ab3a741c0106abb9d1cc60ed566632 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 13/26] Revert "remove silk-paper from settings.gradle.kts" This reverts commit 31c41fc5bb40e64813b5da5fe40ce750aa904dd4. --- .github/workflows/publishing.yml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index cbc3656e..94577a5a 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -14,7 +14,7 @@ jobs: java-version: "21" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build run: ./gradlew build diff --git a/settings.gradle.kts b/settings.gradle.kts index e8dd6333..a4d32d17 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,6 +19,6 @@ include("$projectName-nbt") include("$projectName-network") include("$projectName-persistence") -//include("$projectName-paper") +include("$projectName-paper") include("$projectName-testmod") From df73d79d70c2088f1cdc6b00f678476de0986234 Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:30 +0200 Subject: [PATCH 14/26] Reapply "fix paper requiring current version of other modules" This reverts commit fcf889af6f18c3e3d1852bcd578bb5da9e8bd8bc. --- .github/workflows/publishing.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 94577a5a..68542d0f 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -19,8 +19,23 @@ jobs: - name: Execute Gradle build run: ./gradlew build - - name: Publish to Ossrh - run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + - name: Publish commands to Ossrh + run: ./gradlew :silk-commands:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish core to Ossrh + run: ./gradlew :silk-core:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish game to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish igui to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish network to Ossrh + run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + + - name: Publish paper to Ossrh + run: ./gradlew :silk-paper:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish to Modrinth run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file From f3a64db6734ffe9395688eba4af4fb153f2cfadd Mon Sep 17 00:00:00 2001 From: Paul K Date: Wed, 7 May 2025 23:18:31 +0200 Subject: [PATCH 15/26] Revert "fix paper requiring current version of other modules" This reverts commit 082c7367a474d30838718d80b152efb009c3c27f. --- .github/workflows/publishing.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 68542d0f..94577a5a 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -19,23 +19,8 @@ jobs: - name: Execute Gradle build run: ./gradlew build - - name: Publish commands to Ossrh - run: ./gradlew :silk-commands:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish core to Ossrh - run: ./gradlew :silk-core:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish game to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish igui to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish network to Ossrh - run: ./gradlew :silk-game:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - - - name: Publish paper to Ossrh - run: ./gradlew :silk-paper:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + - name: Publish to Ossrh + run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} - name: Publish to Modrinth run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file From 26e42d41d3440986801dd4c2afd7da7ce0039268 Mon Sep 17 00:00:00 2001 From: Paul K Date: Thu, 12 Jun 2025 00:28:06 +0200 Subject: [PATCH 16/26] increase gradle memory --- gradle/wrapper/gradle-wrapper.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..d2281d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,3 +5,5 @@ networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +#Gradle runner fail +org.gradle.jvmargs=-Xmx4096m From 22460ed4c12ea3f49626938f9863cc1959c90676 Mon Sep 17 00:00:00 2001 From: Paul K Date: Thu, 3 Jul 2025 23:52:19 +0200 Subject: [PATCH 17/26] update gradle action --- .github/workflows/publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 94577a5a..cbc3656e 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -14,7 +14,7 @@ jobs: java-version: "21" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build run: ./gradlew build From df9fde3133255d4474c966fc8a19dc7ebd18bf24 Mon Sep 17 00:00:00 2001 From: Paul K Date: Fri, 4 Jul 2025 00:04:20 +0200 Subject: [PATCH 18/26] use compilerOptions dsl, add higher memory limit --- buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts | 4 ++-- gradle.properties | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts b/buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts index 90557a5a..22ae21f1 100644 --- a/buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts @@ -12,8 +12,8 @@ repositories { tasks { withType { - kotlinOptions { - freeCompilerArgs += "-Xcontext-receivers" + compilerOptions { + freeCompilerArgs.add("-Xcontext-receivers") } } javadoc { diff --git a/gradle.properties b/gradle.properties index 3c075ea7..6ba8017b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ kotlin.code.style=official #fabric.loom.multiProjectOptimisation=true #org.gradle.parallel=true +org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -Dfile.encoding=UTF-8 From 9179e7a33041607d64da87d1b8693db640c19737 Mon Sep 17 00:00:00 2001 From: Paul K Date: Fri, 4 Jul 2025 00:05:53 +0200 Subject: [PATCH 19/26] removed MaxPermSize option --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6ba8017b..28cdf0ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official #fabric.loom.multiProjectOptimisation=true #org.gradle.parallel=true -org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 From d136832c8d545c6d48886db3a158b65b452d6bff Mon Sep 17 00:00:00 2001 From: Paul K Date: Fri, 4 Jul 2025 00:06:09 +0200 Subject: [PATCH 20/26] removed FileEncoding option --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 28cdf0ed..eaf4be92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official #fabric.loom.multiProjectOptimisation=true #org.gradle.parallel=true -org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2g From b82691f0e94fa8f53bc10fa3741559355fda8d3f Mon Sep 17 00:00:00 2001 From: Paul K Date: Fri, 4 Jul 2025 00:12:28 +0200 Subject: [PATCH 21/26] remove memory limit from gradle properties, add it to build action --- .github/workflows/publishing.yml | 3 +++ gradle.properties | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index cbc3656e..0ee4ab94 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -16,6 +16,9 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Setup Gradle Properties + run: echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties + - name: Execute Gradle build run: ./gradlew build diff --git a/gradle.properties b/gradle.properties index eaf4be92..3c075ea7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ kotlin.code.style=official #fabric.loom.multiProjectOptimisation=true #org.gradle.parallel=true -org.gradle.jvmargs=-Xmx2g From 5e336ecf95843985db055d471602554da2e98ba2 Mon Sep 17 00:00:00 2001 From: Paul K Date: Sat, 5 Jul 2025 22:50:36 +0200 Subject: [PATCH 22/26] add signing in ci --- .github/workflows/publishing.yml | 6 +++++- .../src/main/kotlin/project-publish-script.gradle.kts | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 0ee4ab94..0e7a455d 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -17,7 +17,11 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Setup Gradle Properties - run: echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties + run: | + echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties + echo "signingKeyId=${{ secrets.SIGNING_KEY_ID }}" >> gradle.properties + echo "signingKey=${{ secrets.SIGNING_KEY }}" >> gradle.properties + echo "signingPassword=${{ secrets.SIGNING_PASSWORD }}" >> gradle.properties - name: Execute Gradle build run: ./gradlew build diff --git a/buildSrc/src/main/kotlin/project-publish-script.gradle.kts b/buildSrc/src/main/kotlin/project-publish-script.gradle.kts index c3a74d3f..74373d45 100644 --- a/buildSrc/src/main/kotlin/project-publish-script.gradle.kts +++ b/buildSrc/src/main/kotlin/project-publish-script.gradle.kts @@ -1,6 +1,7 @@ import BuildConstants.authors import BuildConstants.githubRepo import BuildConstants.isSnapshot +import java.util.Base64 plugins { kotlin("jvm") @@ -65,5 +66,12 @@ publishing { } signing { + if (System.getenv()["CI"].toBoolean()) { + val keyId = findProperty("signingKeyId")?.toString() + val key = findProperty("signingKey")?.toString() + val password = findProperty("signingPassword")?.toString() + useInMemoryPgpKeys(keyId, String(Base64.getDecoder().decode(key)), password) + } + sign(publishing.publications) } From 63d761d50ef55f9b7557d4585ca74da255a839f0 Mon Sep 17 00:00:00 2001 From: Paul K Date: Sat, 5 Jul 2025 22:55:07 +0200 Subject: [PATCH 23/26] add no-daemon + stacktrace option to gradle --- .github/workflows/publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 0e7a455d..de5080c0 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -24,7 +24,7 @@ jobs: echo "signingPassword=${{ secrets.SIGNING_PASSWORD }}" >> gradle.properties - name: Execute Gradle build - run: ./gradlew build + run: ./gradlew build --no-daemon --stacktrace - name: Publish to Ossrh run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} From 1a8279c112d3dbba7329b9565342f190e9b42d25 Mon Sep 17 00:00:00 2001 From: Paul K Date: Sat, 5 Jul 2025 22:57:52 +0200 Subject: [PATCH 24/26] removed hard coded memory minimum --- gradle/wrapper/gradle-wrapper.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2281d3f..cea7a793 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,5 +5,3 @@ networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -#Gradle runner fail -org.gradle.jvmargs=-Xmx4096m From 45f345838278b0755d44ed1ae974baed38ea3bbb Mon Sep 17 00:00:00 2001 From: Paul K Date: Tue, 2 Sep 2025 14:15:46 +0200 Subject: [PATCH 25/26] use vanniktecks publishing plugin --- .github/workflows/publishing.yml | 18 ++-- buildSrc/build.gradle.kts | 2 + .../kotlin/project-publish-script.gradle.kts | 89 ++++++------------- 3 files changed, 40 insertions(+), 69 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index de5080c0..2d729c1f 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -7,8 +7,8 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.2.2 - - uses: actions/setup-java@v4.6.0 + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 with: distribution: "temurin" java-version: "21" @@ -17,17 +17,19 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Setup Gradle Properties - run: | - echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties - echo "signingKeyId=${{ secrets.SIGNING_KEY_ID }}" >> gradle.properties - echo "signingKey=${{ secrets.SIGNING_KEY }}" >> gradle.properties - echo "signingPassword=${{ secrets.SIGNING_PASSWORD }}" >> gradle.properties + run: echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties - name: Execute Gradle build run: ./gradlew build --no-daemon --stacktrace - name: Publish to Ossrh - run: ./gradlew publishAllPublicationsToOssrhRepository -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }} + run: ./gradlew publishToMavenCentral + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }} - name: Publish to Modrinth run: ./gradlew :silk-all:modrinth -Pmodrinth.token=${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index afdc8b63..d44f18af 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -27,6 +27,8 @@ dependencies { implementation(pluginDep("io.papermc.paperweight.userdev", "1.7.2")) implementation(pluginDep("xyz.jpenilla.run-paper", "2.3.0")) + implementation(pluginDep("com.vanniktech.maven.publish", "0.34.0")) + val compileDokkaVersion = "1.9.20" val dokkaVersion = "1.9.20" diff --git a/buildSrc/src/main/kotlin/project-publish-script.gradle.kts b/buildSrc/src/main/kotlin/project-publish-script.gradle.kts index 74373d45..ee325aa4 100644 --- a/buildSrc/src/main/kotlin/project-publish-script.gradle.kts +++ b/buildSrc/src/main/kotlin/project-publish-script.gradle.kts @@ -1,77 +1,44 @@ import BuildConstants.authors import BuildConstants.githubRepo -import BuildConstants.isSnapshot -import java.util.Base64 +import com.vanniktech.maven.publish.KotlinJvm plugins { - kotlin("jvm") - - `maven-publish` - signing + id("com.vanniktech.maven.publish") } -publishing { - repositories { - maven { - name = "ossrh" - credentials(PasswordCredentials::class) - setUrl( - if (!isSnapshot) - "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" - else - "https://s01.oss.sonatype.org/content/repositories/snapshots" - ) - } - } - - publications { - register(project.name) { - // publish main jars - from(components["java"]) - // also publish dev jar - artifact(tasks.jar) +mavenPublishing { + configure(KotlinJvm()) - this.groupId = project.group.toString() - this.artifactId = project.name - this.version = rootProject.version.toString() + publishToMavenCentral(false) - pom { - name.set(project.name) - description.set(project.description) + signAllPublications() - developers { - authors.forEach { - developer { - name.set(it) - } - } - } + pom { + name = project.name + description = project.description - licenses { - license { - name.set("GNU General Public License 3") - url.set("https://www.gnu.org/licenses/gpl-3.0.txt") - } + developers { + authors.forEach { + developer { + name = it } + } + } - url.set("https://github.com/${githubRepo}") - - scm { - connection.set("scm:git:git://github.com/${githubRepo}.git") - url.set("https://github.com/${githubRepo}/tree/main") - } + licenses { + license { + name = "GNU General Public License 3" + url = "https://www.gnu.org/licenses/gpl-3.0.txt" + distribution = "https://www.gnu.org/licenses/gpl-3.0.txt" } } - } -} -signing { - if (System.getenv()["CI"].toBoolean()) { - val keyId = findProperty("signingKeyId")?.toString() - val key = findProperty("signingKey")?.toString() - val password = findProperty("signingPassword")?.toString() - useInMemoryPgpKeys(keyId, String(Base64.getDecoder().decode(key)), password) - } + url = "https://github.com/$githubRepo" - sign(publishing.publications) -} + scm { + connection = "scm:git:git://github.com/$githubRepo.git" + url = "https://github.com/$githubRepo/tree/main" + developerConnection = "cm:git:ssh://git@github.com/$githubRepo.git" + } + } +} \ No newline at end of file From e96bbada473dee4a9e8bb208fd9051f2646b94ca Mon Sep 17 00:00:00 2001 From: Paul K Date: Sat, 20 Jun 2026 11:54:37 +0200 Subject: [PATCH 26/26] merge --- .github/workflows/publishing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 2d729c1f..b7aa1043 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -7,14 +7,14 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: distribution: "temurin" - java-version: "21" + java-version: "25" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 - name: Setup Gradle Properties run: echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties