From d7b2dd139f7e17d149a50a2ee777d28dac64b9eb Mon Sep 17 00:00:00 2001 From: Keuin Date: Fri, 13 Jan 2023 03:02:26 +0800 Subject: Upgrade loom, loader, fabric, gradle and development JDK. --- build.gradle | 9 ++------- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java | 3 --- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 6f50530..a0678fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' } @@ -34,14 +34,9 @@ dependencies { processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching("fabric.mod.json") { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/gradle.properties b/gradle.properties index 8ede798..81cb9b8 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.12 # Mod Properties mod_version=1.7.0 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/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 diff --git a/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java b/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java index ce14c8a..816cdc6 100644 --- a/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java +++ b/src/main/java/com/keuin/kbackupfabric/util/ZipUtil.java @@ -209,9 +209,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)); -- cgit v1.2.3