Skip to content

Commit a3cac3a

Browse files
committed
fix: Removed jigsaw modules support and updated to Java 11
1 parent 757f444 commit a3cac3a

File tree

6 files changed

+8
-25
lines changed

6 files changed

+8
-25
lines changed

bukkit/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tasks {
2222
}
2323
}
2424
runServer {
25-
minecraftVersion("1.19.3")
25+
minecraftVersion("1.20.2")
2626
}
2727
}
2828

@@ -36,5 +36,4 @@ bukkit {
3636
load = net.minecrell.pluginyml.bukkit.BukkitPluginDescription.PluginLoadOrder.STARTUP
3737
}
3838

39-
java.sourceCompatibility = JavaVersion.VERSION_1_8
40-
java.targetCompatibility = JavaVersion.VERSION_1_8
39+
java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))

common/build.gradle.kts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,14 @@ dependencies {
1010
compileOnly(libs.log4j2)
1111
}
1212

13-
extraJavaModuleInfo {
14-
automaticModule("io.leangen.geantyref:geantyref", "io.leangen.geantyref")
15-
}
16-
1713
tasks {
1814
compileJava {
1915
options.encoding = Charsets.UTF_8.name()
20-
}
21-
jar {
22-
manifest {
23-
attributes("Automatic-Module-Name" to "io.github._4drian3d.logfilter.common")
24-
}
16+
options.release.set(11)
2517
}
2618
}
2719

28-
java.sourceCompatibility = JavaVersion.VERSION_1_8
29-
java.targetCompatibility = JavaVersion.VERSION_1_8
20+
java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
3021

3122
sourceSets {
3223
main {

common/src/main/java/io/github/_4drian3d/logfilter/common/filter/Filters.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
public final class Filters {
99
private Filters() {}
1010

11-
public static String applyFilter(Configuration configuration) {
12-
Logger rootLogger = (Logger)LogManager.getRootLogger();
13-
CustomFilter filter;
11+
public static String applyFilter(final Configuration configuration) {
12+
Logger rootLogger = (Logger) LogManager.getRootLogger();
13+
final CustomFilter filter;
1414
if (configuration.regexMode()) {
1515
filter = new PatternFilter(configuration);
1616
} else {

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rootProject.name = "logfilter-parent"
22

3-
arrayOf("common", "bukkit", "paper", "velocity", "sponge", "waterfall").forEach {
3+
arrayOf("common", "bukkit", "paper", "velocity", "sponge").forEach {
44
include("logfilter-$it")
55
project(":logfilter-$it").projectDir = file(it)
66
}

velocity/src/main/java/module-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

waterfall/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@ bungee {
3434
author = "4drian3d"
3535
}
3636

37-
java.sourceCompatibility = JavaVersion.VERSION_1_8
38-
java.targetCompatibility = JavaVersion.VERSION_1_8

0 commit comments

Comments
 (0)