From 6fcd2cfcce96b23a8b1872bdbcf94f09d31815c9 Mon Sep 17 00:00:00 2001 From: Keuin Date: Mon, 10 Jan 2022 23:07:54 +0800 Subject: Upgrade gradle and fabric-loom. --- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6f50530..2f60bde 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.10-SNAPSHOT' id 'maven-publish' } @@ -14,6 +14,7 @@ repositories { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + mavenCentral() } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3 From 1590656107449ede20e245dda148cfb695a03081 Mon Sep 17 00:00:00 2001 From: Keuin Date: Sun, 2 Oct 2022 22:41:53 +0800 Subject: Bump version. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8ede798..f32e1fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.14.4 yarn_mappings=1.14.4+build.18 loader_version=0.11.0 # Mod Properties -mod_version=1.7.0 +mod_version=1.7.1 maven_group=com.keuin.kbackupfabric archives_base_name=kbackup-fabric # Dependencies -- cgit v1.2.3 From 852c91e04d3f69f973dba215d172dbd50a97e8a8 Mon Sep 17 00:00:00 2001 From: Keuin Date: Mon, 3 Oct 2022 02:07:04 +0800 Subject: Upgrade fabric toolchain, gradle and JDK. --- build.gradle | 102 ++++++++++----------- gradle.properties | 4 +- .../notification/DistinctNotifiable.java | 2 +- .../java/com/keuin/kbackupfabric/util/ZipUtil.java | 3 - 4 files changed, 49 insertions(+), 62 deletions(-) diff --git a/build.gradle b/build.gradle index 2f60bde..97e1f3f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,86 +1,76 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' - id 'maven-publish' + id 'fabric-loom' version '1.0-SNAPSHOT' + id 'maven-publish' } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 archivesBaseName = project.archives_base_name -version = project.mod_version + "_mc" + project.minecraft_version +version = project.mod_version group = project.maven_group repositories { - maven { - url 'https://oss.sonatype.org/content/repositories/snapshots' - } - mavenCentral() + mavenCentral() + + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. } dependencies { - implementation 'junit:junit:4.12' + implementation 'junit:junit:4.13.2' + + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - //to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. - // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. - // You may need to force-disable transitiveness on them. + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } + inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } } // configure the maven publication publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } + publications { + mavenJava(MavenPublication) { + from components.java + } + } - // select the repositories you want to publish to - repositories { - // uncomment to publish to the local maven - // mavenLocal() - } -} + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f32e1fc..219af45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use minecraft_version=1.14.4 yarn_mappings=1.14.4+build.18 -loader_version=0.11.0 +loader_version=0.14.9 # Mod Properties mod_version=1.7.1 maven_group=com.keuin.kbackupfabric archives_base_name=kbackup-fabric # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.28.4+1.14 +fabric_version=0.28.5+1.14 diff --git a/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java b/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java index b44bfce..527808b 100644 --- a/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java +++ b/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java @@ -33,7 +33,7 @@ public interface DistinctNotifiable { @Override public void notify(Text text) { - serverPlayerEntity.sendChatMessage(text, MessageType.SYSTEM); + serverPlayerEntity.sendMessage(text); } @Override diff --git a/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java b/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java index eea1148..3497f20 100644 --- a/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java +++ b/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java @@ -208,9 +208,6 @@ public final class ZipUtil { // 创建解压文件 entryFile = new File(entryFilePath); if (entryFile.exists()) { - // 检测文件是否允许删除，如果不允许删除，将会抛出SecurityException - SecurityManager securityManager = new SecurityManager(); - securityManager.checkDelete(entryFilePath); // 删除已存在的目标文件 if (!entryFile.delete()) throw new IOException(String.format("Failed to delete existing file %s", entryFile.toString())); -- cgit v1.2.3 From 34e56ac07249428ae0dd8043f059a30d3784c71b Mon Sep 17 00:00:00 2001 From: Keuin Date: Mon, 3 Oct 2022 02:45:23 +0800 Subject: Move artifact naming to main branch. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97e1f3f..67b3e86 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 archivesBaseName = project.archives_base_name -version = project.mod_version +version = project.mod_version + "_mc" + project.minecraft_version group = project.maven_group repositories { -- cgit v1.2.3 From e394e795d768f608c0c520a011f3d3627a93f3ab Mon Sep 17 00:00:00 2001 From: Keuin Date: Wed, 28 Sep 2022 23:45:26 +0800 Subject: Add GitHub action: release --- .github/workflows/release.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..1e3ba7a --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,43 @@ +name: release + +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + +jobs: + release: + runs-on: ubuntu-latest + if: github.ref != 'refs/heads/master' + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Make gradlew executable + run: chmod +x gradlew + - name: Gradle build + run: ./gradlew build + - name: Print directory tree + run: find . + - name: Gradle test + run: ./gradlew test + - name: Get version string + run: export VERSION=$(echo ${{ github.ref }} | sed 's/-.\+//') + - name: Upload binaries to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file_glob: true + file: build/libs/kbackup-fabric* + tag: ${{ env.VERSION }} + release_name: ${{ env.VERSION }} + prerelease: true \ No newline at end of file -- cgit v1.2.3 From e9f273cd996c67272741bedbba3400a5b0e85a41 Mon Sep 17 00:00:00 2001 From: Keuin Date: Tue, 4 Oct 2022 02:12:04 +0800 Subject: Fix test CI JDK version. --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5795379..e7efb41 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,7 +11,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '15' + java-version: '17' distribution: 'adopt' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 -- cgit v1.2.3