Update to 1.18-pre2

6 files changed, 15 insertions, 17 deletions

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index 97be15123..74537ef8d 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -20,10 +20,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Upload to CurseForge
         run: ./gradlew build publish curseforge --stacktrace
         env:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e61f0bcf3..f0815e1ff 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew clean build --refresh-dependencies --stacktrace
diff --git a/build.gradle b/build.gradle
index caa103e91..420af8bc1 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("architectury-plugin") version("3.4-SNAPSHOT")
     id("dev.architectury.loom") version("0.10.0-SNAPSHOT") apply false
-    id("org.cadixdev.licenser") version("0.5.0")
+    id("org.cadixdev.licenser") version("0.6.1")
     id("com.matthewprenger.cursegradle") version("1.4.0")
     id("java")
     id("maven-publish")
@@ -9,7 +9,9 @@ plugins {
 
 import java.text.SimpleDateFormat
 
-archivesBaseName = "RoughlyEnoughItems"
+base {
+    archivesBaseName = "RoughlyEnoughItems"
+}
 
 def runNumber = System.getenv("GITHUB_RUN_NUMBER") ?: "9999"
 version = rootProject.base_version + "." + runNumber + (rootProject.unstable.toBoolean() ? "-alpha" : "")
@@ -68,11 +70,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 16
-    }
-
-    tasks.withType(GenerateModuleMetadata) {
-        enabled = false
+        options.release = 17
     }
 
     tasks.withType(GenerateModuleMetadata) {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index d9170eec8..6efe5ff94 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -60,6 +60,6 @@
     }
   },
   "depends": {
-    "minecraft": "1.18-beta.1"
+    "minecraft": "1.18-beta.2"
   }
 }
diff --git a/gradle.properties b/gradle.properties
index f1af4ae3b..01f56a11d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx3G
 base_version=7.0
 unstable=false
-supported_version=1.18-pre1
-minecraft_version=1.18-pre1
+supported_version=1.18-pre2
+minecraft_version=1.18-pre2
 forgeEnabled=false
 forge_version=37.0.95
-fabricloader_version=0.11.6
+fabricloader_version=0.12.5
 cloth_config_version=6.0.42
 modmenu_version=3.0.0
-fabric_api=0.42.2+1.18
+fabric_api=0.42.5+1.18
 architectury_version=3.0.39
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac23e27ba..1a884af0d 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip