Update core and use new loom

README.md

@@ -10,9 +10,7 @@ mappings at runtime for dynamically compiled code, and provides wrappers and DSL
 To use, add the following to your `build.gradle`:
 ```gradle
 repositories {
-    maven {
-        url "https://maven.moddinginquisition.org/releases"
-    }
+    mavenCentral()
 }
 
 configurations {

build.gradle

@@ -1,9 +1,3 @@
-buildscript {
-    dependencies {
-        classpath libs.tinyremapper
-    }
-}
-
 plugins {
     id 'groovy'
     id 'maven-publish'
@@ -70,29 +64,13 @@ static String getGitCommitDate() {
     return new Date(timestamp).format(/yyyy-MM-dd HH:mm:ssZ/, TimeZone.getTimeZone("UTC"))
 }
 
-configurations.configureEach {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.module.with {it?.name == 'tiny-remapper' && it?.group == 'net.fabricmc'}) {
-            details.useTarget libs.tinyremapper
-        }
-    }
-}
-
 loom {
     runs.each {
         it.source sourceSets.test
-        it.vmArgs '-Dnet.fabricmc.tinyremapper.knownindybsm=org/codehaus/groovy/vmplugin/v8/IndyInterface'
     }
 }
 
 repositories {
-    maven {
-        name = "Luke's Maven"
-        url = 'https://maven.lukebemish.dev/releases'
-        content {
-            includeGroup 'net.fabricmc'
-        }
-    }
     maven {
         name = "TheModdingInquisition"
         url = 'https://maven.moddinginquisition.org/releases'

gradle.properties

@@ -1,6 +1,5 @@
 org.gradle.jvmargs = -Xmx3G
 org.gradle.daemon = false
-systemProp.net.fabricmc.tinyremapper.knownindybsm=org/codehaus/groovy/vmplugin/v8/IndyInterface
 
 # Mod Properties
 group = org.groovymc.groovyduvet

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ quilt_loader = "0.18.10"
 parchment_minecraft = "1.19.3"
 parchment_mappings = "2023.03.12"
 qsl = "6.0.1+1.20"
-quilt_loom = "1.2.3"
+quilt_loom = "1.4.1"
 quilt_licenser = "2.0.1"
 cgl = "0.3.8"
 autoservice = "1.1.1"
@@ -17,9 +17,7 @@ minotaur = "2.8.4"
 cursegradle = "1.4.0"
 nexuspublish = "1.3.0"
 
-tinyremapper = "0.8.6+lukebemish.1+local"
-
-groovyduvet_core = "3.0.8"
+groovyduvet_core = "3.1.2"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -28,8 +26,6 @@ qsl = { module = "org.quiltmc:qsl", version.ref = "qsl" }
 
 cgl = { module = "org.groovymc.cgl:cgl-1.20-quilt", version.ref = "cgl" }
 
-tinyremapper = { module = "net.fabricmc:tiny-remapper", version.ref = "tinyremapper" }
-
 autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
 autoextension = { module = "dev.lukebemish.autoextension:autoextension", version.ref = "autoextension" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

settings.gradle

@@ -1,33 +1,19 @@
 pluginManagement {
     repositories {
-        maven {
-            name = "Luke's Maven"
-            url = 'https://maven.lukebemish.dev/releases'
-        }
         maven {
             name = "Quilt"
             url = uri("https://maven.quiltmc.org/repository/release")
-            content {
-                excludeModule 'net.fabricmc', 'tiny-remapper'
-            }
         }
         maven {
             name = "Fabric"
             url = uri("https://maven.fabricmc.net/")
-            content {
-                excludeModule 'net.fabricmc', 'tiny-remapper'
-            }
-        }
-        maven {
-            name = "TheModdingInquisition"
-            url = 'https://maven.moddinginquisition.org/releases'
         }
         gradlePluginPortal()
     }
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 
 rootProject.name = 'groovyduvet'