diff --git a/addon.gradle b/addon.gradle index 0c50bb7..86387bb 100644 --- a/addon.gradle +++ b/addon.gradle @@ -3,14 +3,3 @@ jar { attributes 'FMLCorePlugin': 'mrtjp.relocation.asm.RelocationPlugin' } } - -import org.apache.tools.ant.filters.ReplaceTokens - -task updateAPIVersion(type: Copy) { - from(sourceSets.main.scala.srcDirs) - include '**/package-info.java' - into 'build/sources/scala' - filter(ReplaceTokens, tokens: ['GRADLETOKEN_VERSION': project.version]) -} - -compileScala.dependsOn updateAPIVersion diff --git a/build.gradle b/build.gradle index 24091b4..fa88ae1 100755 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1670779107 +//version: 1671313514 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -47,7 +47,7 @@ buildscript { dependencies { //Overwrite the current ASM version to fix shading newer than java 8 applicatations. classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.11' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13' } } plugins { @@ -280,7 +280,9 @@ minecraft { runDir = 'run' if (replaceGradleTokenInFile) { - replaceIn replaceGradleTokenInFile + for (f in replaceGradleTokenInFile.split(',')) { + replaceIn f + } if (gradleTokenModId) { replace gradleTokenModId, modId } diff --git a/gradle.properties b/gradle.properties index 161b27e..80df7ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ developmentEnvironmentUserName = Developer # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]) # Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = mod.scala +replaceGradleTokenInFile = mod.scala,package-info.java gradleTokenModId = gradleTokenModName = gradleTokenVersion = GRADLETOKEN_VERSION