From 06d8140970661c3b05adedd76f3e09a131d9bee0 Mon Sep 17 00:00:00 2001 From: bjcul Date: Mon, 11 Jul 2022 18:07:56 -0400 Subject: Upgrade to Java 17 --- base/.classpath | 2 +- base/.settings/org.eclipse.jdt.core.prefs | 6 ++--- base/pom.xml | 8 +++--- base/src/main/java/module-info.java | 34 ++++++++++++++++++++++++++ clformat/.classpath | 2 +- clformat/.settings/org.eclipse.jdt.core.prefs | 6 ++--- clformat/pom.xml | 12 ++++----- clformat/src/main/java/module-info.java | 9 +++++++ commander/.classpath | 4 ++- commander/.settings/org.eclipse.jdt.core.prefs | 6 ++--- commander/pom.xml | 4 +-- commander/src/main/java/module-info.java | 6 +++++ pom.xml | 6 ++--- 13 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 base/src/main/java/module-info.java create mode 100644 clformat/src/main/java/module-info.java create mode 100644 commander/src/main/java/module-info.java diff --git a/base/.classpath b/base/.classpath index 673da3f..a1c34bd 100644 --- a/base/.classpath +++ b/base/.classpath @@ -24,7 +24,7 @@ - + diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs index 39e9a95..de5c7e4 100644 --- a/base/.settings/org.eclipse.jdt.core.prefs +++ b/base/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=17 diff --git a/base/pom.xml b/base/pom.xml index 664748a..f23ff4f 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -6,7 +6,7 @@ bjc BJCUtils-Parent - 1.0.0 + 2.0-SNAPSHOT @@ -68,8 +68,8 @@ 3.7.0 - 1.8 - 1.8 + 1.17 + 1.17 @@ -149,7 +149,7 @@ io.github.bculkin2442 esodata - 1.0-SNAPSHOT + 2.0-SNAPSHOT diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java new file mode 100644 index 0000000..188046b --- /dev/null +++ b/base/src/main/java/module-info.java @@ -0,0 +1,34 @@ +module bjc.utils { + exports bjc.utils.exceptions; + exports bjc.utils.funcutils; + exports bjc.utils.parserutils.splitter; + exports bjc.utils.ioutils; + exports bjc.utils.examples; + exports bjc.utils.misc; + exports bjc.utils.parserutils.delims; + exports bjc.utils.gen; + exports bjc.utils.patterns; + exports bjc.utils.components; + exports bjc.utils.cli; + exports bjc.utils.gui.awt; + exports bjc.utils.gui.layout; + exports bjc.utils.examples.gen; + exports bjc.utils.math; + exports bjc.utils.gui; + exports bjc.utils.parserutils; + exports bjc.utils.ioutils.blocks; + exports bjc.utils.parserutils.defines; + exports bjc.utils.graph; + exports bjc.utils.cli.objects; + exports bjc.utils.gui.panels; + exports bjc.utils.ioutils.properties; + + requires commons.lang3; + requires esodata; + requires guava; + requires hamcrest.core; + requires icu4j; + requires java.desktop; + requires java.logging; + requires junit; +} \ No newline at end of file diff --git a/clformat/.classpath b/clformat/.classpath index 2efb9ee..9dab56c 100644 --- a/clformat/.classpath +++ b/clformat/.classpath @@ -18,7 +18,7 @@ - + diff --git a/clformat/.settings/org.eclipse.jdt.core.prefs b/clformat/.settings/org.eclipse.jdt.core.prefs index 2529c98..74568b3 100644 --- a/clformat/.settings/org.eclipse.jdt.core.prefs +++ b/clformat/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning @@ -106,4 +106,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=info org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=17 diff --git a/clformat/pom.xml b/clformat/pom.xml index 4283850..5244694 100644 --- a/clformat/pom.xml +++ b/clformat/pom.xml @@ -6,7 +6,7 @@ BJCUtils-Parent bjc - 1.0.0 + 2.0-SNAPSHOT clformat @@ -28,17 +28,17 @@ bjc BJC-Utils2 - 1.0.0 + 2.0-SNAPSHOT bjc inflexion - 1.0.0 + 2.0-SNAPSHOT io.github.bculkin2442 esodata - 1.0-SNAPSHOT + 2.0-SNAPSHOT @@ -57,8 +57,8 @@ 3.7.0 - 1.8 - 1.8 + 1.17 + 1.17 diff --git a/clformat/src/main/java/module-info.java b/clformat/src/main/java/module-info.java new file mode 100644 index 0000000..286a26c --- /dev/null +++ b/clformat/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module clformat { + exports bjc.utils.ioutils.format.directives; + exports bjc.utils.ioutils.format; + exports bjc.utils.ioutils.format.exceptions; + + requires bjc.utils; + requires esodata; + requires inflexion; +} \ No newline at end of file diff --git a/commander/.classpath b/commander/.classpath index 7d66676..35b3cc1 100644 --- a/commander/.classpath +++ b/commander/.classpath @@ -14,14 +14,16 @@ - + + + diff --git a/commander/.settings/org.eclipse.jdt.core.prefs b/commander/.settings/org.eclipse.jdt.core.prefs index 2f5cc74..cf2cd45 100644 --- a/commander/.settings/org.eclipse.jdt.core.prefs +++ b/commander/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=17 diff --git a/commander/pom.xml b/commander/pom.xml index eaba4a6..c764012 100644 --- a/commander/pom.xml +++ b/commander/pom.xml @@ -6,7 +6,7 @@ bjc BJCUtils-Parent - 1.0.0 + 2.0-SNAPSHOT commander @@ -28,7 +28,7 @@ bjc BJC-Utils2 - 1.0.0 + 2.0-SNAPSHOT jar diff --git a/commander/src/main/java/module-info.java b/commander/src/main/java/module-info.java new file mode 100644 index 0000000..258d184 --- /dev/null +++ b/commander/src/main/java/module-info.java @@ -0,0 +1,6 @@ +module commander { + exports bjc.commander; + + requires bjc.utils; + requires java.logging; +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0aee431..2d53ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ bjc BJCUtils-Parent - 1.0.0 + 2.0-SNAPSHOT pom @@ -14,8 +14,8 @@ 3.7.0 - 1.8 - 1.8 + 1.17 + 1.17 -- cgit v1.2.3