diff --git a/build.gradle.kts b/build.gradle.kts index 331430c..5d70d1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("java-library") id("maven-publish") - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.3.6" } group = "cn.hamster3.mc.plugin" @@ -12,7 +12,7 @@ subprojects { apply { plugin("java-library") plugin("maven-publish") - plugin("com.github.johnrengelman.shadow") + plugin("com.gradleup.shadow") } group = rootProject.group @@ -64,10 +64,9 @@ subprojects { repositories { maven { url = uri("https://maven.airgame.net/public") - credentials { - username = rootProject.properties.getOrDefault("maven_username", "").toString() - password = rootProject.properties.getOrDefault("maven_password", "").toString() + username = findProperty("MAVEN_AIRGAME_USERNAME")?.toString() ?: "" + password = findProperty("MAVEN_AIRGAME_PASSWORD")?.toString() ?: "" } } } diff --git a/core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml index f137cb3..cff1bcb 100644 --- a/core-bukkit/src/main/resources/plugin.yml +++ b/core-bukkit/src/main/resources/plugin.yml @@ -12,7 +12,6 @@ UPDATE_CHECKER: CHECK_TYPE: GITEA_RELEASES GIT_BASE_URL: https://git.airgame.net GIT_REPO: MiniDay/hamster-core - DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-core/ load: STARTUP diff --git a/core-bungee/src/main/resources/bungee.yml b/core-bungee/src/main/resources/bungee.yml index 25a39cd..78bda70 100644 --- a/core-bungee/src/main/resources/bungee.yml +++ b/core-bungee/src/main/resources/bungee.yml @@ -11,4 +11,3 @@ UPDATE_CHECKER: CHECK_TYPE: GITEA_RELEASES GIT_BASE_URL: https://git.airgame.net GIT_REPO: MiniDay/hamster-core - DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-core/ diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java index b437e7a..34a9af1 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; +import java.net.URI; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -45,6 +46,9 @@ public final class UpdateCheckUtils { switch (checkType) { case "GITEA_RELEASES": { lastRelease = getGiteaLastRelease(baseUrl, gitRepo, gitToken); + if (downloadUrl == null) { + downloadUrl = URI.create(baseUrl).resolve(gitRepo).toString(); + } break; } case "GITLAB_RELEASES": { @@ -53,6 +57,9 @@ public final class UpdateCheckUtils { break; } lastRelease = getGitlabLastRelease(baseUrl, projectID, gitToken); + if (downloadUrl == null) { + downloadUrl = URI.create(baseUrl).resolve(gitRepo).toString(); + } break; } } @@ -104,7 +111,6 @@ public final class UpdateCheckUtils { JsonArray array = JSON_PARSER.parse(reader).getAsJsonArray(); for (JsonElement element : array) { JsonObject object = element.getAsJsonObject(); - //noinspection SpellCheckingInspection if (object.get("prerelease").getAsBoolean()) { continue; } diff --git a/core-velocity/src/main/resources/update.yml b/core-velocity/src/main/resources/update.yml index 03181ce..895fc2d 100644 --- a/core-velocity/src/main/resources/update.yml +++ b/core-velocity/src/main/resources/update.yml @@ -2,4 +2,3 @@ VERSION: ${version} CHECK_TYPE: GITEA_RELEASES GIT_BASE_URL: https://git.airgame.net GIT_REPO: MiniDay/hamster-core -DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-core/