Work on clean up and build

jpype-project · Dec 2, 2024 · 13107ae · 13107ae
1 parent 773ec40
commit 13107ae
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 36 deletions.
diff --git a/native/java/module-info.java b/native/java/module-info.java
@@ -0,0 +1,28 @@
+/* ****************************************************************************
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  See NOTICE file for details.
+**************************************************************************** */
+
+module org.jpype {
+  requires java.sql;
+
+  exports org.jpype;
+  exports org.jpype.manager;
+  exports org.jpype.html;
+  exports org.jpype.javadoc;
+  exports org.jpype.pickle;
+  exports org.jpype.pkg;
+  exports org.jpype.proxy;
+  exports org.jpype.ref;
+}
diff --git a/native/java/org/jpype/JPypeClassLoader.java b/native/java/org/jpype/JPypeClassLoader.java
@@ -1,3 +1,18 @@
+/* ****************************************************************************
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  See NOTICE file for details.
+**************************************************************************** */
 package org.jpype;
 
 import java.io.ByteArrayOutputStream;

diff --git a/project/jpype_java/src/main/java/module-info.java b/project/jpype_java/src/main/java/module-info.java
diff --git a/project/jpype_java/src/main/java/org/jpype/JPypeMain.java b/project/jpype_java/src/main/java/org/jpype/JPypeMain.java
diff --git a/setupext/build_ext.py b/setupext/build_ext.py
@@ -300,7 +300,7 @@ def build_java_ext(self, ext):
         distutils.log.info(
             "Jar cache is missing, using --enable-build-jar to recreate it.")
 
-        target_version = "1.8"
+        target_version = "9"
         # build the jar
         try:
             dirname = os.path.dirname(self.get_ext_fullpath("JAVA"))