diff --git a/build.gradle b/build.gradle index 3eb19a2..6274cb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1704751096 +//version: 1705357285 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -122,6 +122,7 @@ propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") propertyDefaultIfUnset("curseForgeRelations", "") +propertyDefaultIfUnset("versionPattern", "") propertyDefaultIfUnset("minimizeShadowedDependencies", true) propertyDefaultIfUnset("relocateShadowedDependencies", true) // Deprecated properties (kept for backwards compat) @@ -370,6 +371,7 @@ catch (Exception ignored) { // Pulls version first from the VERSION env and then git tag String identifiedVersion String versionOverride = System.getenv("VERSION") ?: null +boolean checkVersion = false try { // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty if (versionOverride == null) { @@ -388,6 +390,8 @@ try { } } else if (isDirty) { identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty" + } else { + checkVersion = true } } else { identifiedVersion = versionOverride @@ -409,6 +413,8 @@ ext { if (identifiedVersion == versionOverride) { out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7') +} else if (checkVersion && versionPattern && !(identifiedVersion ==~ versionPattern)) { + throw new GradleException("Invalid version: '$identifiedVersion' does not match version pattern '$versionPattern'") } group = "com.github.GTNewHorizons" @@ -428,18 +434,31 @@ minecraft { for (f in replaceGradleTokenInFile.split(',')) { tagReplacementFiles.add f } + out.style(Style.Info).text('replaceGradleTokenInFile is deprecated! Consider using generateGradleTokenClass.').println() } if (gradleTokenModId) { - injectedTags.put gradleTokenModId, modId + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenModId, modId + } else { + out.style(Style.Failure).text('gradleTokenModId is deprecated! The field will no longer be generated.').println() + } } if (gradleTokenModName) { - injectedTags.put gradleTokenModName, modName + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenModName, modName + } else { + out.style(Style.Failure).text('gradleTokenModName is deprecated! The field will no longer be generated.').println() + } } if (gradleTokenVersion) { injectedTags.put gradleTokenVersion, modVersion } if (gradleTokenGroupName) { - injectedTags.put gradleTokenGroupName, modGroup + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenGroupName, modGroup + } else { + out.style(Style.Failure).text('gradleTokenGroupName is deprecated! The field will no longer be generated.').println() + } } if (enableGenericInjection.toBoolean()) { injectMissingGenerics.set(true) diff --git a/dependencies.gradle b/dependencies.gradle index ba221b3..99ddf58 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,28 +4,28 @@ dependencies { api("com.github.GTNewHorizons:CropLoadCore:0.2.0:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.25:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.43:dev") compileOnly(deobf("https://media.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar")) - compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { + compileOnly("com.github.GTNewHorizons:twilightforest:2.5.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.5-GTNH:dev") - compileOnly("com.github.GTNewHorizons:Natura:2.5.7:dev") { + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.9-GTNH:dev") + compileOnly("com.github.GTNewHorizons:Natura:2.6.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.11:dev") { + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.15:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.2-GTNH:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") // for testing //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") - //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.5-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:Natura:2.5.7:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.11:dev") - //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:twilightforest:2.5.3:dev") + //runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.9-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:Natura:2.6.0:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.15:dev") + //runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.1.2-GTNH:dev") }