diff --git a/build.gradle b/build.gradle index 4f0306c..8e034d6 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,9 @@ repositories { dependencies { api(libs.typetools) implementation(libs.log4j.api) - implementation(libs.modlauncher) - implementation(libs.securemodules) + implementation(libs.bundles.asm) + compileOnly(libs.modlauncher) + compileOnly(libs.securemodules) compileOnly(libs.nulls) } @@ -96,7 +97,7 @@ allprojects { 'Oracle': (16..21), 'SAP': (16..20) ] - + // Tests are expensive to run all variants, so only run if asked to if (!project.hasProperty('bulk_tests')) ext.VALID_VMS = ['Adoptium': [17]]//, 18, 19, 20, 21] ] diff --git a/eventbus-test/src/test/java/module-info.java b/eventbus-test/src/test/java/module-info.java index 8e335a1..f01c1fe 100644 --- a/eventbus-test/src/test/java/module-info.java +++ b/eventbus-test/src/test/java/module-info.java @@ -23,7 +23,7 @@ // Custom events we're testing requires static net.minecraftforge.eventbus.testjars; - requires net.minecraftforge.unsafe; + requires net.minecraftforge.unsafe; provides cpw.mods.modlauncher.api.ITransformationService with net.minecraftforge.eventbus.test.MockTransformerService; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index aef148d..3d677ad 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -4,7 +4,7 @@ */ open module net.minecraftforge.eventbus { uses net.minecraftforge.eventbus.IEventBusEngine; - requires cpw.mods.modlauncher; + requires static cpw.mods.modlauncher; requires org.objectweb.asm; requires org.objectweb.asm.tree;