Skip to content

Commit

Permalink
Bump to MDG 2
Browse files Browse the repository at this point in the history
  • Loading branch information
shartte committed Jan 11, 2025
1 parent d001947 commit f1c9e1c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,11 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/

buildscript {
dependencies {
// Fix for the shadow plugin using outdated ASM
classpath 'org.ow2.asm:asm:9.5'
classpath 'org.ow2.asm:asm-commons:9.5'
}
}

plugins {
id "net.neoforged.moddev"
id "maven-publish"
id "com.diffplug.spotless"
id 'io.github.goooler.shadow'
id 'com.gradleup.shadow'
id "de.undercouch.download"
}

Expand Down Expand Up @@ -183,9 +175,6 @@ neoForge {
gameDirectory = project.file('run')
systemProperties = commonSystemProperties
// property "mixin.debug.export", "true"

additionalRuntimeClasspathConfiguration.extendsFrom configurations.shaded
additionalRuntimeClasspathConfiguration.extendsFrom configurations.guideExportOnly
}
client {
client()
Expand Down Expand Up @@ -246,6 +235,9 @@ neoForge {
}
}

configurations.additionalRuntimeClasspath.extendsFrom configurations.shaded
configurations.additionalRuntimeClasspath.extendsFrom configurations.guideExportOnly

//////////////
// Artifacts
Map<String, String> expansionVariables = [
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import org.gradle.api.initialization.resolve.RulesMode
pluginManagement {
plugins {
id 'com.diffplug.spotless' version '6.25.0'
id 'io.github.goooler.shadow' version '8.1.7'
id 'com.gradleup.shadow' version '8.3.5'
id 'de.undercouch.download' version '5.6.0'
// https://projects.neoforged.net/neoforged/ModDevGradle
id 'net.neoforged.moddev' version '1.0.13'
id 'net.neoforged.moddev.repositories' version '1.0.13'
id 'net.neoforged.moddev' version '2.0.74'
id 'net.neoforged.moddev.repositories' version '2.0.74'
}
}

plugins {
id 'net.neoforged.moddev.repositories'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
}

dependencyResolutionManagement {
Expand Down

0 comments on commit f1c9e1c

Please sign in to comment.