Revert "Add JVM Downgrader (DH now uses Java version Ω)"
This reverts commit af6dca6e5e.
This commit is contained in:
@@ -12,8 +12,6 @@ plugins {
|
|||||||
|
|
||||||
// Architectury is used here only as a replacement for forge's own loom
|
// Architectury is used here only as a replacement for forge's own loom
|
||||||
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
|
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
|
||||||
|
|
||||||
id 'xyz.wagyourtail.jvmdowngrader' version '0.4.0' apply true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -104,7 +102,6 @@ subprojects { p ->
|
|||||||
// Apply plugins
|
// Apply plugins
|
||||||
apply plugin: "java"
|
apply plugin: "java"
|
||||||
apply plugin: "com.github.johnrengelman.shadow"
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
apply plugin: "xyz.wagyourtail.jvmdowngrader"
|
|
||||||
if (isMinecraftSubProject)
|
if (isMinecraftSubProject)
|
||||||
apply plugin: "systems.manifold.manifold-gradle-plugin"
|
apply plugin: "systems.manifold.manifold-gradle-plugin"
|
||||||
|
|
||||||
@@ -316,22 +313,6 @@ subprojects { p ->
|
|||||||
// Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
|
// Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
|
||||||
jar.dependsOn(shadowJar)
|
jar.dependsOn(shadowJar)
|
||||||
|
|
||||||
// For downgrading our project to Java 8
|
|
||||||
if (isMinecraftSubProject) {
|
|
||||||
task jarDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar) {
|
|
||||||
inputFile = tasks.shadowJar.archiveFile
|
|
||||||
archiveClassifier = "downgraded-8"
|
|
||||||
}
|
|
||||||
task apiDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.ShadeAPI) {
|
|
||||||
inputFile = jarDowngrade.archiveFile
|
|
||||||
archiveClassifier = "downgraded-8-shaded"
|
|
||||||
}
|
|
||||||
|
|
||||||
// We're using a custom downgrade task so we disable the original downgrade tasks
|
|
||||||
downgradeJar.enabled = false
|
|
||||||
shadeDowngradedApi.enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Put stuff from gradle.properties into the mod info
|
// Put stuff from gradle.properties into the mod info
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
+2
-2
@@ -23,8 +23,8 @@ loom {
|
|||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
inputFile = apiDowngrade.archiveFile
|
inputFile = shadowJar.archiveFile
|
||||||
dependsOn apiDowngrade
|
dependsOn shadowJar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -51,8 +51,8 @@ loom {
|
|||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
inputFile = apiDowngrade.archiveFile
|
inputFile = shadowJar.archiveFile
|
||||||
dependsOn apiDowngrade
|
dependsOn shadowJar
|
||||||
}
|
}
|
||||||
|
|
||||||
def addMod(path, enabled) {
|
def addMod(path, enabled) {
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ loom {
|
|||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
inputFile = apiDowngrade.archiveFile
|
inputFile = shadowJar.archiveFile
|
||||||
dependsOn apiDowngrade
|
dependsOn shadowJar
|
||||||
// classifier null
|
// classifier null
|
||||||
|
|
||||||
atAccessWideners.add("distanthorizons.accesswidener")
|
atAccessWideners.add("distanthorizons.accesswidener")
|
||||||
|
|||||||
@@ -33,14 +33,6 @@ pluginManagement {
|
|||||||
name "ParchmentMC"
|
name "ParchmentMC"
|
||||||
url "https://maven.parchmentmc.org"
|
url "https://maven.parchmentmc.org"
|
||||||
}
|
}
|
||||||
maven { // Used for downgrading Java versions
|
|
||||||
name "Wagyourtail Release Repository"
|
|
||||||
url "https://maven.wagyourtail.xyz/releases"
|
|
||||||
}
|
|
||||||
maven { // Used for downgrading Java versions
|
|
||||||
name "Wagyourtail Snapshot Repository"
|
|
||||||
url "https://maven.wagyourtail.xyz/snapshots"
|
|
||||||
}
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user