From cbf85af11349d9711e35486d1eceb0ef84565b3f Mon Sep 17 00:00:00 2001 From: Hubry Date: Wed, 22 Jul 2020 13:49:39 +0200 Subject: [PATCH] Bump Forge for included Mixin, add Mixin as annot processor, verbose CI --- Jenkinsfile | 6 +++--- build.gradle | 11 +++++++++-- src/main/resources/META-INF/mods.toml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6674f90ac..f4cd29210 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { steps { echo 'Cleaning Project' sh 'chmod +x gradlew' - sh './gradlew clean --refresh-dependencies --no-daemon' + sh './gradlew clean -i --no-daemon' } } stage('Build and Deploy Release') { @@ -18,7 +18,7 @@ pipeline { RELEASE_MODE = '1' } steps { - sh './gradlew build publish --refresh-dependencies --no-daemon' + sh './gradlew build publish -i --refresh-dependencies --no-daemon' } } stage('Build and Deploy Snapshot') { @@ -28,7 +28,7 @@ pipeline { } } steps { - sh './gradlew build publish --refresh-dependencies --no-daemon' + sh './gradlew build publish -i --refresh-dependencies --no-daemon' } } } diff --git a/build.gradle b/build.gradle index 882e8f3af..5311084cd 100644 --- a/build.gradle +++ b/build.gradle @@ -108,8 +108,15 @@ test { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-32.0.71" - compile 'org.spongepowered:mixin:0.8' + minecraft "net.minecraftforge:forge:${mc_version}-32.0.75" + + annotationProcessor 'org.spongepowered:mixin:0.8' + annotationProcessor 'com.google.code.gson:gson:2.8.0' + annotationProcessor 'com.google.guava:guava:21.0' + annotationProcessor 'org.ow2.asm:asm-tree:7.2' + annotationProcessor 'org.ow2.asm:asm-commons:7.2' + annotationProcessor 'org.ow2.asm:asm-util:7.2' + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39") diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a0da212f3..21c225c07 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -16,7 +16,7 @@ Botania is a mod that adds nature magic to Minecraft''' [[dependencies.botania]] modId="forge" mandatory=true - versionRange="[32.0.68,)" + versionRange="[32.0.75,)" ordering="NONE" side="BOTH"