update diffpatch, publish to our repo

PaperMC · Apr 2, 2024 · 67bb9bc · 67bb9bc
1 parent 9e10ccb
commit 67bb9bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Deploy release
-        run: ./gradlew publishPlugins --no-daemon --stacktrace
+        run: ./gradlew -Dorg.gradle.parallel=true publish --no-daemon --stacktrace -Dorg.gradle.internal.http.socketTimeout=90000 -Dorg.gradle.internal.http.connectionTimeout=90000
         env:
-          GRADLE_PUBLISH_KEY: "${{ secrets.GRADLE_PLUGIN_PORTAL_KEY }}"
-          GRADLE_PUBLISH_SECRET: "${{ secrets.GRADLE_PLUGIN_PORTAL_SECRET }}"
+          ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}
       - name: Parse tag
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}

diff --git a/buildSrc/src/main/kotlin/config-publish.gradle.kts b/buildSrc/src/main/kotlin/config-publish.gradle.kts
@@ -54,7 +54,12 @@ val shadowJar by tasks.existing(ShadowJar::class) {
 
 publishing {
     repositories {
-        maven("https://repo.papermc.io/repository/maven-snapshots/") {
+        val url = if (project.version.toString().endsWith("-SNAPSHOT")) {
+            "https://repo.papermc.io/repository/maven-snapshots/"
+        } else {
+            "https://repo.papermc.io/repository/maven-releases/"
+        }
+        maven(url) {
             credentials(PasswordCredentials::class)
             name = "paper"
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ spotless = "com.diffplug.spotless:6.20.0"
 [libraries]
 serialize-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialize" }
 serialize-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialize" }
-diffpatch = "codechicken:DiffPatch:1.5.0.29"
+diffpatch = "codechicken:DiffPatch:1.5.0.30"
 coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2"
 jgit = "org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r"