Forráskód Böngészése

Update build setup to 1.18-rc1, with Forge disabled

malte0811 3 éve
szülő
commit
7f09a043dd

+ 1 - 1
build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 16
+        options.release = 17
     }
 
     java {

+ 2 - 4
common/build.gradle

@@ -32,15 +32,13 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     testImplementation(platform('org.junit:junit-bom:5.7.1'))
     testImplementation('org.junit.jupiter:junit-jupiter')
-    // Not what MC depends on (21), but Forge/FG sometimes end up with 27 because it's a transitive dependency of
-    // patchy (Mojang lib for chat blocking)
-    googleaccessCompileOnly('com.google.guava:guava:27.0.1-jre')
+    googleaccessCompileOnly('com.google.guava:guava:31.0.1-jre')
     googleaccessCompileOnly('org.jetbrains:annotations:19.0.0')
 }
 
 architectury {
     injectInjectables = false
-    common()
+    common(false)
 }
 
 jar {

+ 0 - 1
forge/build.gradle

@@ -22,7 +22,6 @@ loom {
                 "dedupmultipart",
                 "blockstatecache",
                 "dedupbakedquad",
-                "chunknbt",
         ].stream()
                 .<String> map({ s -> "ferritecore." + s + ".mixin.json" })
                 .collect(Collectors.toList())

+ 2 - 2
gradle.properties

@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx2048M
 org.gradle.daemon=false
-minecraft_version=1.17.1
+minecraft_version=1.18-rc1
 archives_base_name=ferritecore
-mod_version=3.1.0
+mod_version=4.0.0
 maven_group=malte0811.ferritecore
 fabric_loader_version=0.11.3
 forge_version=37.0.59

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 2 - 2
settings.gradle

@@ -9,6 +9,6 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+//include("forge")
 
-rootProject.name = "FerriteCore-1.17"
+rootProject.name = "FerriteCore-1.18"