From b79cacc0408efb75e686332da3e6643d548abe76 Mon Sep 17 00:00:00 2001 From: Tec Date: Sun, 19 Apr 2020 11:17:27 +0200 Subject: Attempt to upgrade gradle to 4.8.1 --- build.gradle | 31 +++--- gradle/wrapper/gradle-wrapper.properties | 6 +- .../ForgeGradle-1.2.2-SNAPSHOT-javadoc.jar | Bin 0 -> 568159 bytes .../1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.jar | Bin 0 -> 514179 bytes .../1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.pom | 106 +++++++++++++++++++++ .../1.2.2-SNAPSHOT/maven-metadata-local.xml | 12 +++ .../gradle/ForgeGradle/maven-metadata-local.xml | 11 +++ 7 files changed, 149 insertions(+), 17 deletions(-) create mode 100644 mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT-javadoc.jar create mode 100644 mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.jar create mode 100644 mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.pom create mode 100644 mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/maven-metadata-local.xml create mode 100644 mavenLocal/net/minecraftforge/gradle/ForgeGradle/maven-metadata-local.xml diff --git a/build.gradle b/build.gradle index 6ec5f8e3e5..4be211b64a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,9 @@ buildscript { repositories { + maven { + name = "mavenLocal" + url = "mavenLocal" + } mavenCentral() maven { name = "forge" @@ -11,7 +15,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.2-SNAPSHOT' classpath "de.undercouch:gradle-download-task:3.1.2" } } @@ -20,6 +24,14 @@ plugins { id 'org.ajoberstar.grgit' version '3.1.1' } +file "build.properties" withReader { + def prop = new Properties() + prop.load(it) + ext.config = new ConfigSlurper().parse prop +} + +ext.set("minecraftVersion","${config.minecraft.version}-${config.forge.version}-${config.minecraft.version}") + import de.undercouch.gradle.tasks.download.Download apply plugin: 'forge' apply plugin: 'signing' @@ -39,23 +51,14 @@ sourceSets { } } -file "build.properties" withReader { - def prop = new Properties() - prop.load(it) - ext.config = new ConfigSlurper().parse prop -} - version = "${config.minecraft.version}-${config.tectech.version}" group = "com.github.technus" archivesBaseName = "TecTech" -minecraft { - version = "${config.minecraft.version}-${config.forge.version}-${config.minecraft.version}" - runDir = "eclipse" - - replaceIn "src/main/java/com/github/technus/tectech/auxiliary/Reference.java" - replace "GRADLETOKEN_VERSION", "${config.tectech.version}" -} +minecraft.version = ext.get("minecraftVersion") +minecraft.runDir = "eclipse" +minecraft.replaceIn "src/main/java/com/github/technus/tectech/auxiliary/Reference.java" +minecraft.replace "GRADLETOKEN_VERSION", "${config.tectech.version}" configurations { provided diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39c1bb6d1b..7b33d51c2f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jul 21 17:13:31 CEST 2019 +#Sun Apr 19 08:14:01 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT-javadoc.jar b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT-javadoc.jar new file mode 100644 index 0000000000..52fb12544c Binary files /dev/null and b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT-javadoc.jar differ diff --git a/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.jar b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.jar new file mode 100644 index 0000000000..869ba4cb93 Binary files /dev/null and b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.jar differ diff --git a/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.pom b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.pom new file mode 100644 index 0000000000..143732d174 --- /dev/null +++ b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/ForgeGradle-1.2.2-SNAPSHOT.pom @@ -0,0 +1,106 @@ + + + 4.0.0 + net.minecraftforge.gradle + ForgeGradle + 1.2.2-SNAPSHOT + + + org.ow2.asm + asm-debug-all + 5.0.3 + compile + + + com.google.guava + guava + 18.0 + compile + + + net.sf.opencsv + opencsv + 2.3 + compile + + + com.cloudbees + diff4j + 1.1 + compile + + + com.github.abrarsyed.jastyle + jAstyle + 1.2 + compile + + + net.sf.trove4j + trove4j + 2.1.0 + compile + + + com.github.jponge + lzma-java + 1.3 + compile + + + com.nothome + javaxdelta + 2.0.1 + compile + + + com.google.code.gson + gson + 2.2.4 + compile + + + com.github.tony19 + named-regexp + 0.2.3 + compile + + + net.md-5 + SpecialSource + 1.7.3 + compile + + + org.apache.httpcomponents + httpclient + 4.3.3 + compile + + + org.apache.httpcomponents + httpmime + 4.3.3 + compile + + + de.oceanlabs.mcp + RetroGuard + 3.6.6 + compile + + + de.oceanlabs.mcp + mcinjector + 3.2-SNAPSHOT + compile + + + net.minecraftforge.srg2source + Srg2Source + 3.2-SNAPSHOT + compile + + + diff --git a/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/maven-metadata-local.xml b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 0000000000..87ed94ad22 --- /dev/null +++ b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/1.2.2-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + net.minecraftforge.gradle + ForgeGradle + 1.2.2-SNAPSHOT + + + true + + 20200419091233 + + diff --git a/mavenLocal/net/minecraftforge/gradle/ForgeGradle/maven-metadata-local.xml b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/maven-metadata-local.xml new file mode 100644 index 0000000000..4f9586c58a --- /dev/null +++ b/mavenLocal/net/minecraftforge/gradle/ForgeGradle/maven-metadata-local.xml @@ -0,0 +1,11 @@ + + + net.minecraftforge.gradle + ForgeGradle + + + 1.2.2-SNAPSHOT + + 20200419091233 + + -- cgit