From 43c8bae1053eceaabe704802be5ce782d3f44471 Mon Sep 17 00:00:00 2001
From: Max <maxh2709@gmail.com>
Date: Tue, 18 May 2021 17:43:50 +0200
Subject: [PATCH] [norelease] Update to archloom 0.7.2 and Gradle 7

---
 build.gradle                             | 4 ++--
 forge/gradle.properties                  | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 testmod-common/build.gradle              | 2 +-
 testmod-fabric/build.gradle              | 4 ++--
 testmod-forge/gradle.properties          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 135eb466..b357edce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.1-SNAPSHOT"
-    id "forgified-fabric-loom" version "0.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "0.7.2-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.5.0"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "maven-publish"
@@ -11,7 +11,7 @@ architectury {
 }
 
 subprojects {
-    apply plugin: "forgified-fabric-loom"
+    apply plugin: "dev.architectury.loom"
 
     loom {
         silentMojangMappingsLicense()
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 01c185b6..32f842a6 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1 +1 @@
-loom.forge=true
\ No newline at end of file
+loom.platform=forge
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f9..f371643e 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/testmod-common/build.gradle b/testmod-common/build.gradle
index 67a232ad..45b48561 100644
--- a/testmod-common/build.gradle
+++ b/testmod-common/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     mappings loom.officialMojangMappings()
     // We depend on fabric loader here to use the fabric @Environment annotations
     // Do NOT use other classes from fabric loader
-    modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     implementation project(":common")
 }
 
diff --git a/testmod-fabric/build.gradle b/testmod-fabric/build.gradle
index 13a31909..3dd01de8 100644
--- a/testmod-fabric/build.gradle
+++ b/testmod-fabric/build.gradle
@@ -11,8 +11,8 @@ architectury {
 dependencies {
     minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}"
     mappings loom.officialMojangMappings()
-    modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modCompile "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     modCompileOnly "io.github.prospector:modmenu:${rootProject.mod_menu_version}"
 
     implementation project(path: ":fabric", configuration: "dev")
diff --git a/testmod-forge/gradle.properties b/testmod-forge/gradle.properties
index 01c185b6..32f842a6 100644
--- a/testmod-forge/gradle.properties
+++ b/testmod-forge/gradle.properties
@@ -1 +1 @@
-loom.forge=true
\ No newline at end of file
+loom.platform=forge
\ No newline at end of file