diff --git a/build.gradle b/build.gradle index 55a51f9d..35792256 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ plugins { id "checkstyle" id 'org.openjfx.javafxplugin' id 'com.github.johnrengelman.shadow' - id 'org.gradlex.extra-java-module-info' } repositories { @@ -39,11 +38,6 @@ java { withSourcesJar() } -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - it.options.release = 17 -} - javafx { version = javafx_version modules = [ 'javafx.controls', 'javafx.web' ] @@ -86,22 +80,19 @@ dependencies { runtimeOnly "org.openjfx:javafx-media:${javafx_version}:linux" } -extraJavaModuleInfo { - failOnMissingModuleInfo.set(false) // because of transitive dependencies - - // CFR - automaticModule("net.fabricmc:cfr", "cfr") - - // Vineflower - automaticModule("org.vineflower:vineflower", "org.vineflower.vineflower") +application { + mainClass = 'matcher.Main' +} - // Procyon - automaticModule("org.bitbucket.mstrobel:procyon-compilertools", "procyon.compilertools") +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + it.options.release = 17 } -application { - mainModule = 'matcher' - mainClass = 'matcher.Main' +jar { + manifest { + attributes 'Automatic-Module-Name': 'matcher' + } } jar { diff --git a/gradle.properties b/gradle.properties index 1bbdf7a5..7a9f300b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx2G # Gradle Plugins javafx_plugin_version = 0.1.0 shadow_version = 7.1.2 -extra_java_module_info_version = 1.6 # Poject Properties version = 0.1.0 diff --git a/settings.gradle b/settings.gradle index 797324ea..6e24704a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,6 @@ pluginManagement { plugins { id 'org.openjfx.javafxplugin' version "${javafx_plugin_version}" id 'com.github.johnrengelman.shadow' version "${shadow_version}" - id 'org.gradlex.extra-java-module-info' version "${extra_java_module_info_version}" } } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java deleted file mode 100644 index c5f2b99c..00000000 --- a/src/main/java/module-info.java +++ /dev/null @@ -1,32 +0,0 @@ -module matcher { - exports matcher.config; - exports matcher.srcprocess; - exports matcher.gui; - exports matcher.gui.tab; - exports matcher.type; - exports matcher.gui.menu; - exports matcher.mapping; - exports matcher.classifier; - exports matcher; - exports matcher.bcremap; - exports matcher.serdes; - - requires transitive org.slf4j; - requires cfr; - requires com.github.javaparser.core; - requires org.vineflower.vineflower; - requires java.prefs; - requires transitive javafx.base; - requires transitive javafx.controls; - requires transitive javafx.graphics; - requires transitive javafx.web; - requires transitive org.objectweb.asm; - requires transitive org.objectweb.asm.tree; - requires org.objectweb.asm.commons; - requires org.objectweb.asm.tree.analysis; - requires org.objectweb.asm.util; - requires procyon.compilertools; - requires transitive net.fabricmc.mappingio; - - uses matcher.Plugin; -}