diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef7f672..7f39aa5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: ./.gradle ./**/.gradle key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v2 +# - name: validate gradle wrapper +# uses: gradle/wrapper-validation-action@v2 - name: setup jdk 17 uses: actions/setup-java@v4 with: @@ -44,7 +44,7 @@ jobs: if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - name: Build - run: ./gradlew "Refresh active project" buildAndCollect cli:shadowJar + run: ./gradlew buildAndCollect cli:shadowJar - name: Stop gradle daemon run: ./gradlew --stop - name: capture build artifacts (mods) diff --git a/build.gradle.kts b/build.gradle.kts index cea415f..26b36b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") id("io.github.goooler.shadow") version "8.1.7" - id("dev.kikugie.j52j") id("me.modmuss50.mod-publish-plugin") } diff --git a/gradle.properties b/gradle.properties index c85e184..d93e980 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.caching.debug=false org.gradle.configureondemand=true # Mod properties -mod.version=0.3.14 +mod.version=0.3.15 mod.group=com.github.zly2006 mod.id=x-backup mod.name=X Backup @@ -21,7 +21,7 @@ mod.mc_targets=[VERSIONED] # Global dependencies deps.kotlin_loader_version=1.12.3+kotlin.2.0.21 deps.exposed_version=0.57.0 -deps.fabric_loader=0.16.13 +deps.fabric_loader=0.18.1 deps.ktor_version=2.3.12 # Versioned dependencies diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle.kts b/settings.gradle.kts index d7e20a4..063d34a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,7 @@ stonecutter { "1.21.4", "1.21.5", "1.21.6", + "1.21.9", ) } create(rootProject) diff --git a/src/main/kotlin/com/github/zly2006/xbackup/XBackup.kt b/src/main/kotlin/com/github/zly2006/xbackup/XBackup.kt index 2f190ac..96117db 100644 --- a/src/main/kotlin/com/github/zly2006/xbackup/XBackup.kt +++ b/src/main/kotlin/com/github/zly2006/xbackup/XBackup.kt @@ -42,9 +42,9 @@ object XBackup : ModInitializer { lateinit var config: Config private val configPath = FabricLoader.getInstance().configDir.resolve("x-backup.config.json") val log = LoggerFactory.getLogger("XBackup")!! - const val MOD_VERSION = /*$ mod_version*/ "0.3.14+yisibite" - const val GIT_COMMIT = /*$ git_commit*/ "2021110" - const val COMMIT_DATE = /*$ commit_date*/ "2025-08-13T22:59:22+08:00" + const val MOD_VERSION = /*$ mod_version*/ "0.3.15" + const val GIT_COMMIT = /*$ git_commit*/ "3e6be7e" + const val COMMIT_DATE = /*$ commit_date*/ "2025-12-01T16:51:46+08:00" var _service: BackupDatabaseService? = null val service get() = _service!! var server: MinecraftServer? = null diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index b1e41b0..d609505 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -1,12 +1,11 @@ plugins { id("dev.kikugie.stonecutter") - id("fabric-loom") version "1.10.1" apply false + id("fabric-loom") version "1.11-SNAPSHOT" apply false kotlin("jvm") version "2.0.21" apply false kotlin("plugin.serialization") version "2.0.0" apply false id("io.github.goooler.shadow") version "8.1.7" apply false base - id("dev.kikugie.j52j") version "2.0" apply false id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false id("org.ajoberstar.grgit") version "5.0.0-rc.3" } diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties new file mode 100644 index 0000000..b6bd710 --- /dev/null +++ b/versions/1.21.9/gradle.properties @@ -0,0 +1,8 @@ +# https://fabricmc.net/develop +deps.yarn_build=1 +deps.fabric_api=0.134.0+1.21.9 + +mod.mc_dep=>=1.21.9 <=1.21.10 +mod.mc_title=1.21.9 +mod.mc_targets=1.21.9 1.21.10 +deps.poly_lib=