From cae79c2b68c87946117413d77726fd38afde4e0e Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Sun, 2 May 2021 13:17:19 -0300
Subject: [PATCH] update gradle + loom

---
 build.gradle                             | 12 +++---------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 viafabric-mc117/build.gradle.kts         |  2 +-
 viafabric-mc18/build.gradle.kts          |  2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index c30e086..8c6cf7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id "java"
     id "maven-publish"
-    id "fabric-loom" version "0.5.43" apply false
+    id "fabric-loom" version "0.7-SNAPSHOT" apply false
     id "org.ajoberstar.grgit" version "3.1.1"
     id "com.matthewprenger.cursegradle" version "1.4.0"
 }
@@ -190,10 +190,6 @@ task javadocJar(type: Jar) {
 build.dependsOn javadocJar
 
 subprojects {
-    dependencies {
-        testmodCompile sourceSets.main.output
-    }
-
     task remapMavenJar(type: Copy, dependsOn: remapJar) {
         afterEvaluate {
             from("${project.buildDir}/libs/$archivesBaseName-${version}.jar")
@@ -283,17 +279,15 @@ sourceSets {
 dependencies {
     minecraft("com.mojang:minecraft:1.8.9")
     mappings("net.fabricmc:yarn:1.8.9+build.202103291533:v2")
-    modCompile("net.fabricmc:fabric-loader:0.10.5+build.213")
+    modImplementation("net.fabricmc:fabric-loader:0.10.5+build.213")
 
     include("com.viaversion:viaversion:4.0.0-21w17a")
     include("org.yaml:snakeyaml:1.28")
 
     afterEvaluate {
         subprojects.each {
-            implementation project(path: ":${it.name}", configuration: "dev")
+            //implementation project(path: ":${it.name}", configuration: "dev")
             include project("${it.name}:")
-
-            testmodCompile project("${it.name}:").sourceSets.testmod.output
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..f371643 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/viafabric-mc117/build.gradle.kts b/viafabric-mc117/build.gradle.kts
index e3b4b7e..a4d2e0a 100644
--- a/viafabric-mc117/build.gradle.kts
+++ b/viafabric-mc117/build.gradle.kts
@@ -3,7 +3,7 @@ version = rootProject.version
 dependencies {
     minecraft("com.mojang:minecraft:21w15a")
     mappings("net.fabricmc:yarn:21w15a+build.16:v2")
-    modCompile("net.fabricmc:fabric-loader:0.10.5+build.213")
+    modImplementation("net.fabricmc:fabric-loader:0.10.5+build.213")
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:0.33.0+1.17")
     modImplementation("com.terraformersmc:modmenu:1.16.9")
diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts
index 5427898..888afdc 100644
--- a/viafabric-mc18/build.gradle.kts
+++ b/viafabric-mc18/build.gradle.kts
@@ -3,7 +3,7 @@ version = rootProject.version
 dependencies {
 	minecraft("com.mojang:minecraft:1.8.9")
 	mappings("net.fabricmc:yarn:1.8.9+build.202103291533:v2")
-	modCompile("net.fabricmc:fabric-loader:0.10.5+build.213")
+	modImplementation("net.fabricmc:fabric-loader:0.10.5+build.213")
 
 	modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.1.0+1.8.9")
 	modImplementation("io.github.boogiemonster1o1:modmenu:0.1.0+1.8.9")