Skip to content

Commit

Permalink
Un-"modularize" Matcher (remove JPMS)
Browse files Browse the repository at this point in the history
  • Loading branch information
NebelNidas committed Apr 19, 2023
1 parent 8c573d9 commit b06b3b9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 55 deletions.
32 changes: 10 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
id "checkstyle"
id 'org.openjfx.javafxplugin'
id 'com.github.johnrengelman.shadow'
id 'org.gradlex.extra-java-module-info'
}

repositories {
Expand Down Expand Up @@ -37,11 +36,6 @@ java {
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
}

javafx {
version = javafx_version
modules = [ 'javafx.controls', 'javafx.web' ]
Expand Down Expand Up @@ -81,25 +75,19 @@ dependencies {
runtimeOnly "org.openjfx:javafx-media:${javafx_version}:linux"
}

extraJavaModuleInfo {
failOnMissingModuleInfo.set(false) // because of transitive dependencies

// Mappping IO
automaticModule("net.fabricmc:mapping-io", "net.fabricmc.mappingio")

// CFR
automaticModule("net.fabricmc:cfr", "cfr")

// Fernflower
automaticModule("net.fabricmc:fabric-fernflower", "intellij.fernflower")
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'
}
}

publishing {
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx2G
# Gradle Plugins
javafx_plugin_version = 0.0.13
shadow_version = 7.1.2
extra_java_module_info_version = 1.3

# Poject Properties
version = 0.1.0
Expand Down
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}

Expand Down
31 changes: 0 additions & 31 deletions src/main/java/module-info.java

This file was deleted.

0 comments on commit b06b3b9

Please sign in to comment.