Skip to content

Commit

Permalink
Revert "Set up Shadow for bundling DFU"
Browse files Browse the repository at this point in the history
This reverts commit 2bb8166.
  • Loading branch information
shedaniel committed Nov 13, 2023
1 parent c241812 commit 594562f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
31 changes: 8 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
alias(libs.plugins.kotlin) apply false // Delay this so we can perform magic 🪄 first.
alias(libs.plugins.spotless)
alias(libs.plugins.retry)
alias(libs.plugins.shadow)
}

/**
Expand Down Expand Up @@ -92,13 +91,6 @@ configurations {
compileClasspath.extendsFrom bootstrap
runtimeClasspath.extendsFrom bootstrap
testRuntimeClasspath.extendsFrom bootstrap
bundled {
transitive = false
}
compileClasspath.extendsFrom bundled
runtimeClasspath.extendsFrom bundled
testCompileClasspath.extendsFrom bundled
testRuntimeClasspath.extendsFrom bundled
}

configurations.all {
Expand Down Expand Up @@ -195,7 +187,7 @@ dependencies {
implementation libs.mcinjector
implementation libs.opencsv
implementation libs.forge.diffpatch
bundled libs.datafixerupper
implementation libs.datafixerupper

// Forge mods.toml parsing
implementation libs.night.config.toml
Expand Down Expand Up @@ -231,13 +223,6 @@ jar {
from sourceSets.cfr.output.classesDirs
from sourceSets.fernflower.output.classesDirs
from sourceSets.vineflower.output.classesDirs
archiveClassifier = "slim"
}

shadowJar {
archiveClassifier = ""
configurations = [project.configurations.bundled]
relocate 'com.mojang', 'dev.architectury.loom.relocated.com.mojang'
}

base {
Expand Down Expand Up @@ -349,14 +334,14 @@ publishing {
publications {
if (isSnapshot) return

// Also publish a snapshot so people can use the latest version if they wish
snapshot(MavenPublication) { publication ->
groupId project.group
artifactId project.base.archivesName.get()
version baseVersion + '-SNAPSHOT'
// Also publish a snapshot so people can use the latest version if they wish
snapshot(MavenPublication) { publication ->
groupId project.group
artifactId project.base.archivesName.get()
version baseVersion + '-SNAPSHOT'

shadow.component(publication)
}
from components.java
}

// Manually crate the plugin marker for snapshot versions
snapshotPlugin(MavenPublication) {
Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ test-retry = "1.5.4"
checkstyle = "10.12.2"
codenarc = "3.3.0"
jacoco = "0.8.10"
shadow = "8.1.1"

# Forge libraries
forge-installer-tools = "1.2.0"
Expand Down Expand Up @@ -68,7 +67,6 @@ datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixe
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
retry = { id = "org.gradle.test-retry", version.ref = "test-retry" }
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

[bundles]
asm = ["asm", "asm-analysis", "asm-commons", "asm-tree", "asm-util"]

0 comments on commit 594562f

Please sign in to comment.