mirror of
https://github.com/architectury/architectury-loom.git
synced 2026-04-02 05:27:43 -05:00
Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
48
build.gradle
48
build.gradle
@@ -93,27 +93,7 @@ dependencies {
|
||||
implementation ('org.benf:cfr:0.150')
|
||||
|
||||
// source code remapping
|
||||
implementation ('org.cadixdev:mercury:0.2.9-architectury')
|
||||
|
||||
// Mercury pulls all of these deps in, however eclipse does not specify the exact version to use so they can get updated without us knowing.
|
||||
// Depend specifically on these versions to prevent them from being updated under our feet.
|
||||
// The POM is also patched later on to as this strict versioning does not make it through.
|
||||
implementation ('org.eclipse.jdt:org.eclipse.jdt.core:[3.21.0]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.compare.core:[3.6.1000]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.commands:[3.9.800]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.contenttype:[3.7.900]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.expressions:[3.7.100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.filesystem:[1.7.700]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.jobs:[3.10.1100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.resources:[3.14.0]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.core.runtime:[3.20.100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.equinox.app:[1.5.100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.equinox.common:[3.14.100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.equinox.preferences:[3.8.200]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.equinox.registry:[3.10.100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.osgi:[3.16.200]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.team.core:[3.8.1100]')
|
||||
implementation ('org.eclipse.platform:org.eclipse.text:[3.11.0]')
|
||||
implementation ('dev.architectury:mercury:0.1.0.10')
|
||||
|
||||
// Kapt integration
|
||||
compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21')
|
||||
@@ -232,20 +212,6 @@ import org.w3c.dom.Document
|
||||
import org.w3c.dom.Element
|
||||
import org.w3c.dom.Node
|
||||
|
||||
def patchPom(groovy.util.Node node) {
|
||||
node.dependencies.first().each {
|
||||
def groupId = it.get("groupId").first().value().first()
|
||||
|
||||
// Patch all eclipse deps to use a strict version
|
||||
if (groupId.startsWith("org.eclipse.")) {
|
||||
def version = it.get("version").first().value().first()
|
||||
if (!version.startsWith("[")) {
|
||||
it.get("version").first().value = new groovy.util.NodeList(["[$version]"])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
plugin(MavenPublication) {
|
||||
@@ -255,10 +221,6 @@ publishing {
|
||||
from components.java
|
||||
artifact mainJar
|
||||
artifact sourcesJar
|
||||
|
||||
pom.withXml {
|
||||
patchPom(asNode())
|
||||
}
|
||||
}
|
||||
|
||||
maven(MavenPublication) { publication ->
|
||||
@@ -269,10 +231,6 @@ publishing {
|
||||
artifact mainJar
|
||||
artifact sourcesJar
|
||||
artifact javadocJar
|
||||
|
||||
pom.withXml {
|
||||
patchPom(asNode())
|
||||
}
|
||||
}
|
||||
|
||||
if (isSnapshot) return
|
||||
@@ -286,10 +244,6 @@ publishing {
|
||||
artifact mainJar
|
||||
artifact sourcesJar
|
||||
artifact javadocJar
|
||||
|
||||
pom.withXml {
|
||||
patchPom(asNode())
|
||||
}
|
||||
}
|
||||
|
||||
pluginSnapshot(MavenPublication) {
|
||||
|
||||
Reference in New Issue
Block a user