Upgrade to java 17

9 files changed, 60 insertions, 19 deletions

diff --git a/base/.classpath b/base/.classpath
index d539cb5..3b99fc1 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -11,14 +11,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs
index 714351a..cf2cd45 100644
--- a/base/.settings/org.eclipse.jdt.core.prefs
+++ b/base/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +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.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/base/pom.xml b/base/pom.xml
index 20b8a8e..509847a 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>bjc</groupId>
 		<artifactId>dicelang-parent</artifactId>
-		<version>1.0.0</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>dicelang-base</artifactId>
@@ -50,7 +50,15 @@
 					</execution>
 				</executions>
 			</plugin> -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
 
+				<configuration>
+					<source>1.17</source>
+					<target>1.17</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>3.0.0</version>
@@ -105,19 +113,19 @@
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>BJC-Utils2</artifactId>
-			<version>1.0.0</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>dicelang-dice</artifactId>
-			<version>1.0.0</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>dicelang-scl</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
diff --git a/base/src/module-info.java b/base/src/module-info.java
new file mode 100644
index 0000000..b3df025
--- /dev/null
+++ b/base/src/module-info.java
@@ -0,0 +1,16 @@
+module dicelang.base {
+	exports bjc.dicelang.cli;
+	exports bjc.dicelang.eval;
+	exports bjc.dicelang;
+	exports bjc.dicelang.tokens;
+	exports bjc.dicelang.expr;
+	exports bjc.dicelang.util;
+
+	requires bjc.utils;
+	requires dicelang.dice;
+	requires dicelang.scl;
+	requires esodata;
+	requires guava;
+	requires java.logging;
+	requires jline;
+}
\ No newline at end of file
diff --git a/dice/.classpath b/dice/.classpath
index 7d66676..35b3cc1 100644
--- a/dice/.classpath
+++ b/dice/.classpath
@@ -14,14 +14,16 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/example/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/dice/.settings/org.eclipse.jdt.core.prefs b/dice/.settings/org.eclipse.jdt.core.prefs
index 2f5cc74..cf2cd45 100644
--- a/dice/.settings/org.eclipse.jdt.core.prefs
+++ b/dice/.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/dice/pom.xml b/dice/pom.xml
index d1d4fec..af1d24b 100644
--- a/dice/pom.xml
+++ b/dice/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>bjc</groupId>
 		<artifactId>dicelang-parent</artifactId>
-		<version>1.0.0</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>dicelang-dice</artifactId>
@@ -25,17 +25,16 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.13.1</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>BJC-Utils2</artifactId>
-			<version>1.0.0</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bculkin2442</groupId>
 			<artifactId>esodata</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/dice/src/main/java/module-info.java b/dice/src/main/java/module-info.java
new file mode 100644
index 0000000..74cc1b9
--- /dev/null
+++ b/dice/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+module dicelang.dice {
+	exports bjc.dicelang.neodice;
+	exports bjc.dicelang.neodice.statements;
+	exports bjc.dicelang.dicev2;
+	exports bjc.dicelang.dice;
+	exports bjc.dicelang.neodice.commands;
+
+	requires bjc.utils;
+	requires esodata;
+	requires junit;
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fb785ec..0aba55e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>bjc</groupId>
 	<artifactId>dicelang-parent</artifactId>
-	<version>1.0.0</version>
+	<version>2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<build>
@@ -14,8 +14,8 @@
 				<version>3.7.0</version>
 
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.17</source>
+					<target>1.17</target>
 				</configuration>
 			</plugin>