diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e7505747d..66c5baa5f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,5 +13,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Cache + uses: actions/cache@v1 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }} - name: Build with Gradle run: ./gradlew build diff --git a/build.gradle b/build.gradle index fba944c92..9f4179217 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ ext.configFile = file('build.properties') ext.config = parseConfig(configFile) ext.priv = parseConfig(file('private.properties')) +def mc_version = "1.14.4" version = "${config.version}-${config.build_number}" group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = config.mod_name @@ -31,7 +32,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: "${config.mc_mappings}" + mappings channel: 'snapshot', version: "20191111-1.14.3" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -92,7 +93,7 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}" + minecraft "net.minecraftforge:forge:${mc_version}-28.1.92" compile fg.deobf("vazkii.patchouli:Patchouli:1.1-25.126") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api") @@ -170,8 +171,8 @@ task incrementBuildNumber { config.toProperties().store(it, "") } - file('web/versions.ini').append("\n${project.version}=${config.mc_version}") - file("${config.dir_repo}/version/${config.mc_version}.txt").write("${project.version}") + file('web/versions.ini').append("\n${project.version}=${mc_version}") + file("${config.dir_repo}/version/${mc_version}.txt").write("${project.version}") } } @@ -256,7 +257,7 @@ curseforge { See http://botaniamod.net/changelog.php#${version} """ releaseType = "release" - addGameVersion "${config.mc_version}" + addGameVersion "${mc_version}" relations { requiredLibrary 'curios' optionalLibrary 'quark' diff --git a/build.properties b/build.properties index 7e0fbf6b0..d8c111f77 100644 --- a/build.properties +++ b/build.properties @@ -1,10 +1,7 @@ # #Sun Jan 19 17:57:06 CST 2020 version=r1.11 -mc_mappings=20191111-1.14.3 dir_output=../Build Output/Botania/ -forge_version=28.1.92 dir_repo=./ -mc_version=1.14.4 build_number=377 mod_name=Botania