From 96996e2b5d505e95425e260e9d0461ddb9d7ca49 Mon Sep 17 00:00:00 2001 From: basdxz Date: Tue, 5 Jan 2021 16:44:13 +0000 Subject: fiddles --- gradle.properties | 1 - 1 file changed, 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index f8e0e6ba6b..336898a2eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ projectVersion=4.10.2 - ic2Version=2.2.828-experimental gt5uVersion=experimental-SNAPSHOT yamcoreVersion=1.7.10-0.5.79 -- cgit From 3372bf76c781202e7fd5a7ba97084e36eba6dae3 Mon Sep 17 00:00:00 2001 From: basdxz Date: Wed, 6 Jan 2021 10:46:47 +0000 Subject: Disgusting patch for Jenkins building Renamed gradle.properties to real.gradle.properties Since on the GTNH Jenkins the gradle.properties gets overwritten --- build.gradle.kts | 70 ++++++++++++++++++++++++++++++++++++-------------- gradle.properties | 18 ------------- real.gradle.properties | 18 +++++++++++++ 3 files changed, 69 insertions(+), 37 deletions(-) delete mode 100644 gradle.properties create mode 100644 real.gradle.properties (limited to 'gradle.properties') diff --git a/build.gradle.kts b/build.gradle.kts index d08343cce1..1e93837d30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,6 @@ import net.minecraftforge.gradle.user.UserExtension +import java.io.FileInputStream +import java.util.* import java.io.* buildscript { @@ -43,11 +45,21 @@ sourceSets.getByName("main") { java.srcDir("AVRcore/src") } -//Load versioning +//Load Minecraft Version val Project.minecraft: UserExtension get() = extensions.getByName("minecraft") -val projectVersion: String by project +//TODO Delete this! This exists to load the configs from the real properties file, which is needed for Jenkins to build +//Gradle will load gradle.properties from it's home, it's install, and the project folder. Clearly whoever setup the +//Jenkins jar signing needs to be reminded of this! +val fis = FileInputStream("real.gradle.properties") +val prop = Properties() +prop.load(fis) + +//TODO Delete +val projectVersion: String = prop.getProperty("projectVersion") +//TODO Uncomment +//val projectVersion: String by project //Generates a hash for each new commit to differentiate versions var commitHash = Runtime @@ -112,24 +124,44 @@ dependencies { //Local Libraries compile(fileTree("libs") { this.include("*.jar") }) + //TODO Uncomment //Versions from properties - val ic2Version: String by project - val gt5uVersion: String by project - val yamcoreVersion: String by project - val opencomputersVersion: String by project - val computercraftVersion: String by project - val baublesVersion: String by project - val thaumcraftVersion: String by project - val codechickenlibVersion: String by project - val codechickencoreVersion: String by project - val neiVersion: String by project - val wailaVersion: String by project - val galacticraftVersion: String by project - val galacticGregVersion: String by project - val buildcraftVersion: String by project - val forestryVersion: String by project - val enderioVersion: String by project - val enderCoreVersion: String by project + //val ic2Version: String by project + //val gt5uVersion: String by project + //val yamcoreVersion: String by project + //val opencomputersVersion: String by project + //val computercraftVersion: String by project + //val baublesVersion: String by project + //val thaumcraftVersion: String by project + //val codechickenlibVersion: String by project + //val codechickencoreVersion: String by project + //val neiVersion: String by project + //val wailaVersion: String by project + //val galacticraftVersion: String by project + //val galacticGregVersion: String by project + //val buildcraftVersion: String by project + //val forestryVersion: String by project + //val enderioVersion: String by project + //val enderCoreVersion: String by project + + //TODO Delete + val ic2Version: String = prop.getProperty("ic2Version") + val gt5uVersion: String = prop.getProperty("gt5uVersion") + val yamcoreVersion: String = prop.getProperty("yamcoreVersion") + val opencomputersVersion: String = prop.getProperty("opencomputersVersion") + val computercraftVersion: String = prop.getProperty("computercraftVersion") + val baublesVersion: String = prop.getProperty("baublesVersion") + val thaumcraftVersion: String = prop.getProperty("thaumcraftVersion") + val codechickenlibVersion: String = prop.getProperty("codechickenlibVersion") + val codechickencoreVersion: String = prop.getProperty("codechickencoreVersion") + val neiVersion: String = prop.getProperty("neiVersion") + val wailaVersion: String = prop.getProperty("wailaVersion") + val galacticraftVersion: String = prop.getProperty("galacticraftVersion") + val galacticGregVersion: String = prop.getProperty("galacticGregVersion") + val buildcraftVersion: String = prop.getProperty("buildcraftVersion") + val forestryVersion: String = prop.getProperty("forestryVersion") + val enderioVersion: String = prop.getProperty("enderioVersion") + val enderCoreVersion: String = prop.getProperty("enderCoreVersion") //Hard Dependencies compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev") diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 336898a2eb..0000000000 --- a/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -projectVersion=4.10.2 -ic2Version=2.2.828-experimental -gt5uVersion=experimental-SNAPSHOT -yamcoreVersion=1.7.10-0.5.79 -opencomputersVersion=MC1.7.10-1.7.5.1291 -computercraftVersion=1.75 -baublesVersion=1.7.10-1.0.1.10 -thaumcraftVersion=1.7.10-4.2.3.5 -codechickenlibVersion=1.7.10-1.1.3.140 -codechickencoreVersion=1.7.10-1.0.7.47 -neiVersion=1.7.10-1.0.5.120 -wailaVersion=1.5.10_1.7.10 -galacticraftVersion=1.7-3.0.12.504 -galacticGregVersion=master-SNAPSHOT -buildcraftVersion=7.1.23 -forestryVersion=4.2.16.64 -enderioVersion=1.7.10-2.3.0.429_beta -enderCoreVersion=1.7.10-0.2.0.39_beta \ No newline at end of file diff --git a/real.gradle.properties b/real.gradle.properties new file mode 100644 index 0000000000..336898a2eb --- /dev/null +++ b/real.gradle.properties @@ -0,0 +1,18 @@ +projectVersion=4.10.2 +ic2Version=2.2.828-experimental +gt5uVersion=experimental-SNAPSHOT +yamcoreVersion=1.7.10-0.5.79 +opencomputersVersion=MC1.7.10-1.7.5.1291 +computercraftVersion=1.75 +baublesVersion=1.7.10-1.0.1.10 +thaumcraftVersion=1.7.10-4.2.3.5 +codechickenlibVersion=1.7.10-1.1.3.140 +codechickencoreVersion=1.7.10-1.0.7.47 +neiVersion=1.7.10-1.0.5.120 +wailaVersion=1.5.10_1.7.10 +galacticraftVersion=1.7-3.0.12.504 +galacticGregVersion=master-SNAPSHOT +buildcraftVersion=7.1.23 +forestryVersion=4.2.16.64 +enderioVersion=1.7.10-2.3.0.429_beta +enderCoreVersion=1.7.10-0.2.0.39_beta \ No newline at end of file -- cgit From eb89cfd8cb58e621e247afa594c80359c7ec96fa Mon Sep 17 00:00:00 2001 From: basdxz Date: Wed, 6 Jan 2021 12:17:58 +0000 Subject: whacky sign attempt --- build.gradle.kts | 43 ++++++++++++++++++++++--------------------- gradle.properties | 4 ++++ 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 gradle.properties (limited to 'gradle.properties') diff --git a/build.gradle.kts b/build.gradle.kts index 765009726d..7821683664 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,6 +19,7 @@ plugins { java signing } + apply(plugin = "forge") //Downloads Javadocs and sources by default @@ -53,9 +54,10 @@ val Project.minecraft: UserExtension //TODO Delete this! This exists to load the configs from the real properties file, which is needed for Jenkins to build //Gradle will load gradle.properties from it's home, it's install, and the project folder. Clearly whoever setup the //Jenkins jar signing needs to be reminded of this! -val fis = FileInputStream("real.gradle.properties") val prop = Properties() -prop.load(fis) +prop.load(FileInputStream("real.gradle.properties")) +val propSign = Properties() +propSign.load(FileInputStream("gradle.properties")) //TODO Delete val projectVersion: String = prop.getProperty("projectVersion") @@ -237,26 +239,25 @@ artifacts { this.archives(devJar) } -tasks.register("signJar") { - dependsOn("reobf") +signing { + sign(tasks["jar"]) } -//TODO Convert Sign Jar to Kotlin -//task signJar(dependsOn: 'reobf') { -// doLast { -// ant.signjar( -// destDir: jar.destinationDir, -// jar: jar.getArchivePath(), -// alias: findProperty('keyStoreAlias') ?: '', -// keystore: findProperty('keyStore') ?: '', -// storepass: findProperty('keyStorePass') ?: '', -// digestalg: findProperty('signDigestAlg') ?: '', -// tsaurl: findProperty('signTSAurl') ?: '', -// verbose: true -// ) -// } -//} +tasks.named("signJar") { + extra["signing.keyId"] = propSign.getProperty("keyStoreAlias") + extra["signing.secretKeyRingFile"] = propSign.getProperty("keyStore") + extra["signing.password"] = propSign.getProperty("keyStorePass") + dependsOn(":reobf") +} -//signing { -// sign(tasks["reobf"]) +//task signJar(type: SignJar, dependsOn: reobfJar) { +// // findProperty allows us to reference the property without it existing. +// // Using project.propName would cause the script to fail validation if +// // the property did not exist. +// keyStore = project.findProperty('keyStore') +// alias = project.findProperty('keyStoreAlias') +// storePass = project.findProperty('keyStorePass') +// keyPass = project.findProperty('keyStoreKeyPass') +// inputFile = jar.archivePath +// outputFile = jar.archivePath //} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..83dd93b556 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +#Dummy File, replaced in Jenkins +keyStoreAlias=w +keyStore=w +keyStorePass=w \ No newline at end of file -- cgit