From ab83665d9aea1dc16aeae6db8dd0534036134a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Gris?= Date: Thu, 29 Apr 2021 17:05:24 +0200 Subject: [PATCH] fix(gradle): fix gradle wrapper script and plugins - Update the wrapper to 5.6.4 - Switch to overminddl1 for Forge - Upgrade version and repository of Grgit TODO: Host an ivy for EquivalentExchange3-1.7.10-0.3.505-dev.jar at http://downloads.gtnewhorizons.com/Mods_for_Jenkins/ --- build.gradle | 136 +++++++++++------------ gradle/wrapper/gradle-wrapper.jar | Bin 55627 -> 55627 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 67 insertions(+), 71 deletions(-) diff --git a/build.gradle b/build.gradle index 72bd47a9..f390946e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,33 +2,49 @@ buildscript { repositories { mavenCentral() maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" + name = "gt" + url = "https://gregtech.overminddl1.com/" } maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { + name = "jitpack.io" + url = "https://jitpack.io" + } + maven { + name = 'ajoberstar-backup' + url = 'https://ajoberstar.org/bintray-backup/' + } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - classpath 'org.ajoberstar:gradle-git:0.10.1' + classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT' } } plugins { - id 'com.matthewprenger.cursegradle' version '1.0.3' + // project.grgit is not available and the repository we're working in is not + // interacted with: + id 'org.ajoberstar.grgit' version '4.0.2' apply false } - -apply plugin: 'forge' -apply plugin: 'maven-publish' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - +// An explicit import is necessary because the plugin was not applied: import org.ajoberstar.grgit.Grgit -def repo = Grgit.open(project.file('.')) +apply plugin: 'forge' +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'signing' +apply plugin: 'java-library' +apply plugin: 'maven-publish' + +compileJava { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + options.encoding = "UTF-8" +} + +def repo = Grgit.open() project.ext.gitHash = repo.log().find().abbreviatedId def branchname = repo.branch.getCurrent().fullName if (branchname.contains('HEAD')) { @@ -60,27 +76,34 @@ configurations { } repositories { - maven { - name 'Chicken Bones Repo' - url "http://chickenbones.net/maven/" - } + maven { + name = "gt" + url = "https://gregtech.overminddl1.com/" + } maven { - name 'Prof Mobius Repo' - url "http://mobiusstrip.eu/maven" - } + name 'Chicken Bones Repo' + url "http://chickenbones.net/maven/" + } + + maven { + name 'Prof Mobius Repo' + url "http://mobiusstrip.eu/maven" + } maven { name 'Chisel Repo' url "http://maven.tterrag.com/" } + + } dependencies { - //compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" - compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" - compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" - compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev" + compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" + compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" + compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" + compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev" compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev" compile "com.pahimar.ee3:EquivalentExchange3:1.7.10-0.3.505:dev" @@ -89,33 +112,32 @@ dependencies { } } -processResources - { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version +processResources { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' - // replace version and mcversion - expand 'version': project.version, 'mcversion': project.minecraft.version - } + // replace version and mcversion + expand 'version': project.version, 'mcversion': project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } - } - jar { configurations.shade.each { dep -> from(project.zipTree(dep)){ exclude 'META-INF', 'META-INF/**', '*.info' } } - + manifest { attributes 'FMLAT': 'chisel_compile_at.cfg' } @@ -131,7 +153,7 @@ task deobfJar(type: Jar) { task apiJar(type: Jar) { from sourceSets.main.allSource from sourceSets.main.output - include 'com/cricketcraft/chisel/api/**/*' + include 'com/cricketcraft/chisel/api/**/*' classifier = 'api' } @@ -196,31 +218,5 @@ String getChangelogText() { return str } -tasks.curseforge.dependsOn 'reobf' -tasks.curseforge.enabled = !dev && project.hasProperty('curseforge_key') - -curseforge { - if (project.hasProperty('curseforge_key')) { - apiKey = project.curseforge_key - } - - project { - id = project.projectId - changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG') - changelogType = 'html' - releaseType = 'release' - relations { - embeddedLibrary 'ctmlib' - } - mainArtifact(jar) { - displayName = "Chisel - ${version}" - } - addArtifact deobfJar - addArtifact sourcesJar - addArtifact(apiJar) { - relations {} - } - } -} - idea { module { inheritOutputDirs = true } } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a1347e58afd717f8b5ec6f158a91325210d46ccb..75ae3ac7c980652b3eac33db80678f118e97613d 100644 GIT binary patch delta 1140 zcmXw%T}YE*6vv-;n;)|=KM`k5v^8<5vs$i(X?PRrR5U|PO|ATlBqKtRN~th!4D=}~ zi~=Q5nI*nf(05(b<~BF?X?0NvDOON~7k*Im`kd3n%k$%$|M{QuocFO#imj7kd67{p z2_Yny5Jg8+ai3fzVQ2a&I7bTLT&-j$E$89@Iyg1J5T{|lJGm<&pi0TO1V|?B=fXD( z`A_p}3XYIQ5g{6yZBX*IkX?`}X$bL(0)>>EkVKYBk;Mdpc}~P4E5GG@J6N1WV|$W0tlg)TA?5E}na93(Gi54)WC&Q z{O_#92r%AKEDZ+I9FE7f1yxRLn^5flqRTa@AXC@o1u)m9;=kty2_Y`wQ&Fxqnm%@i z(cyX%=t>)!MNAjjr&A9Lt30D5B!THpc;x(Y(}bJ}=}6lTsJPiK#;x4#d-$)2KC;ZVJtkr=>OA@y8vCPrX31R2^gJ@c+q zloT$q@JERyXpWgxsC&Tb7cY~yUPH&-M9_EyBZ<}j}f59gI8Yk;21extQztj n0?oQNAHe8C81UsmWXXpM*Zc80xBWQkFMkDS3g^&pbZ+n;9r|no delta 1140 zcmXw%YegBOZkpL6=~^87gGfBxq@=Y1>_V#|bBUYIME z1Q8NQ$n7-0{XKG(gqpSvOR)WkJm<~Bc?nUF*~bpABa5yJQC@1V~vLm^UEs$R^7tu60!M}!e_LIW34 z@xL?T!oYZQku(rUb0`Me=2tqfZETeth%QwpflOVKRF+ zLWk;%pew0w5;0wPk4`-#tn##ykXWWW?w0dQjpK4Aq{FR0pyFnm7`Jk_{T0-zA1Gs& zh1c*bl8|ldwS4DA#Rg`(Iu|)VDzyG6d|Q}pqBod&x+lS``>GbrUS2QQ2(i%7VO-5~ zV<3|Gen|lHyWDR3{zgK`IpL3PXRY=6C!Bq;->B4RJTvZS;xN`xz+<4^$H;$3z!Ky*e oLC~yu@&IzZ2z}lhh%9<>;d&olr{9O8{_>TBreGEgM`j290U~LCCjbBd diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2c2bbe5f..4c463175 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip