diff --git a/build.gradle b/build.gradle index c82195b..d53c0e4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1725973221 +//version: 1743737794 /* * DO NOT CHANGE THIS FILE! * Also, you may replace this file at any time if there is an update available. @@ -80,6 +80,7 @@ propertyDefaultIfUnset("includeWellKnownRepositories", true) propertyDefaultIfUnset("includeCommonDevEnvMods", true) propertyDefaultIfUnset("stripForgeRequirements", false) propertyDefaultIfUnset("noPublishedSources", false) +propertyDefaultIfUnset("mixinProviderSpec", "zone.rong:mixinbooter:10.6") propertyDefaultIfUnset("forceEnableMixins", false) propertyDefaultIfUnset("mixinConfigRefmap", "mixins.${project.modId}.refmap.json") propertyDefaultIfUnsetWithEnvVar("enableCoreModDebug", false, "CORE_MOD_DEBUG") @@ -518,7 +519,6 @@ configurations { testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable) } -String mixinProviderSpec = 'zone.rong:mixinbooter:9.1' dependencies { if (usesMixins.toBoolean()) { annotationProcessor 'org.ow2.asm:asm-debug-all:5.2' @@ -871,9 +871,9 @@ if (enableJava17RunTasks.toBoolean()) { dependencies { if (modId != 'lwjgl3ify') { java17Dependencies("io.github.twilightflower:lwjgl3ify:1.0.0") - } - java17PatchDependencies("io.github.twilightflower:lwjgl3ify:1.0.0:forgePatches") { + java17PatchDependencies("io.github.twilightflower:lwjgl3ify:1.0.0:forgePatches") { transitive = false + } } } @@ -1009,7 +1009,7 @@ abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { if (project.usesMixins.toBoolean()) { this.extraJvmArgs.addAll(project.provider(() -> { - def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(mixinProviderSpec)) mixinCfg.canBeConsumed = false mixinCfg.canBeResolved = true mixinCfg.transitive = false diff --git a/gradle.properties b/gradle.properties index 0d8cd3c..1e3d762 100644 --- a/gradle.properties +++ b/gradle.properties @@ -87,6 +87,8 @@ accessTransformersFile = # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false +# Mixin Provider to use. Primarily changed when needing to use a different version. +mixinProviderSpec = zone.rong:mixinbooter:9.4 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! mixinsPackage = # Location of the mixin config refmap. If left, blank, defaults to "mixins.${modId}.refmap.json". Target file must have the "json" extension. diff --git a/renovate.json b/renovate.json index 06ac5c5..c75414b 100644 --- a/renovate.json +++ b/renovate.json @@ -9,17 +9,15 @@ ], "automerge": false, "packageRules": [ - { - "matchFiles": [ - "build.gradle", - "dependencies.gradle" - ], - "enabled": false - }, { "matchDatasources": ["gradle-version"], "registryUrls": [ - "https://domain.tld/repository/custom-gradle-wrapper/versions.json" + "https://www.cursemaven.com", + "https://api.modrinth.com/maven", + "https://maven.cleanroommc.com", + "https://maven.blamejared.com", + "https://nexus.gtnewhorizons.com/repository/public/", + "https://maven.gtceu.com" ] }, { diff --git a/settings.gradle b/settings.gradle index badc33c..46a4b1d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,7 +35,7 @@ gradleEnterprise { blowdryerSetup { repoSubfolder 'spotless' - github 'GTModpackTeam/Buildscripts', 'tag', 'v1.0.1' + github 'GTModpackTeam/Buildscripts', 'tag', 'v1.0.3' } rootProject.name = rootProject.projectDir.getName()