Return back to single JAR

masesdevelopers · Sep 2, 2024 · 4c5a37f · 4c5a37f
1 parent dada924
commit 4c5a37f
Show file tree

Hide file tree

Showing 58 changed files with 5 additions and 289 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -90,13 +90,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
@@ -173,13 +166,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -131,9 +131,7 @@ jobs:
         GITHUB_SIMPLIFIED_GENERATION: true
 
     - if: matrix.language == 'java' 
-      run: |
-        mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
+      run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -38,13 +38,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
@@ -47,8 +47,8 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
+      - name: Create Jars for JNet
+        run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
@@ -90,13 +90,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
@@ -146,13 +139,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,13 +45,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Create Jars for JNetCore
-        run: mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.../org/mases/jnet/developed/JNetHelper.java → .../org/mases/jnet/developed/JNetHelper.java b/.../org/mases/jnet/developed/JNetHelper.java → .../org/mases/jnet/developed/JNetHelper.java
diff --git a/...s/jnet/developed/JNetReflectorHelper.java → ...s/jnet/developed/JNetReflectorHelper.java b/...s/jnet/developed/JNetReflectorHelper.java → ...s/jnet/developed/JNetReflectorHelper.java
diff --git a/...d/java/lang/UncaughtExceptionHandler.java → ...d/java/lang/UncaughtExceptionHandler.java b/...d/java/lang/UncaughtExceptionHandler.java → ...d/java/lang/UncaughtExceptionHandler.java
diff --git a/.../jnet/developed/java/util/Comparator.java → .../jnet/developed/java/util/Comparator.java b/.../jnet/developed/java/util/Comparator.java → .../jnet/developed/java/util/Comparator.java
diff --git a/...et/developed/java/util/EventListener.java → ...et/developed/java/util/EventListener.java b/...et/developed/java/util/EventListener.java → ...et/developed/java/util/EventListener.java
diff --git a/...eloped/java/util/function/BiConsumer.java → ...eloped/java/util/function/BiConsumer.java b/...eloped/java/util/function/BiConsumer.java → ...eloped/java/util/function/BiConsumer.java
diff --git a/...eloped/java/util/function/BiFunction.java → ...eloped/java/util/function/BiFunction.java b/...eloped/java/util/function/BiFunction.java → ...eloped/java/util/function/BiFunction.java
diff --git a/...loped/java/util/function/BiPredicate.java → ...loped/java/util/function/BiPredicate.java b/...loped/java/util/function/BiPredicate.java → ...loped/java/util/function/BiPredicate.java
diff --git a/...ed/java/util/function/BinaryOperator.java → ...ed/java/util/function/BinaryOperator.java b/...ed/java/util/function/BinaryOperator.java → ...ed/java/util/function/BinaryOperator.java
diff --git a/...d/java/util/function/BooleanSupplier.java → ...d/java/util/function/BooleanSupplier.java b/...d/java/util/function/BooleanSupplier.java → ...d/java/util/function/BooleanSupplier.java
diff --git a/...eveloped/java/util/function/Consumer.java → ...eveloped/java/util/function/Consumer.java b/...eveloped/java/util/function/Consumer.java → ...eveloped/java/util/function/Consumer.java
diff --git a/...a/util/function/DoubleBinaryOperator.java → ...a/util/function/DoubleBinaryOperator.java b/...a/util/function/DoubleBinaryOperator.java → ...a/util/function/DoubleBinaryOperator.java
diff --git a/...ed/java/util/function/DoubleConsumer.java → ...ed/java/util/function/DoubleConsumer.java b/...ed/java/util/function/DoubleConsumer.java → ...ed/java/util/function/DoubleConsumer.java
diff --git a/...ed/java/util/function/DoubleFunction.java → ...ed/java/util/function/DoubleFunction.java b/...ed/java/util/function/DoubleFunction.java → ...ed/java/util/function/DoubleFunction.java
diff --git a/...d/java/util/function/DoublePredicate.java → ...d/java/util/function/DoublePredicate.java b/...d/java/util/function/DoublePredicate.java → ...d/java/util/function/DoublePredicate.java
diff --git a/...ed/java/util/function/DoubleSupplier.java → ...ed/java/util/function/DoubleSupplier.java b/...ed/java/util/function/DoubleSupplier.java → ...ed/java/util/function/DoubleSupplier.java
diff --git a/...va/util/function/DoubleToIntFunction.java → ...va/util/function/DoubleToIntFunction.java b/...va/util/function/DoubleToIntFunction.java → ...va/util/function/DoubleToIntFunction.java
diff --git a/...a/util/function/DoubleToLongFunction.java → ...a/util/function/DoubleToLongFunction.java b/...a/util/function/DoubleToLongFunction.java → ...a/util/function/DoubleToLongFunction.java
diff --git a/...va/util/function/DoubleUnaryOperator.java → ...va/util/function/DoubleUnaryOperator.java b/...va/util/function/DoubleUnaryOperator.java → ...va/util/function/DoubleUnaryOperator.java
diff --git a/...eveloped/java/util/function/Function.java → ...eveloped/java/util/function/Function.java b/...eveloped/java/util/function/Function.java → ...eveloped/java/util/function/Function.java
diff --git a/...java/util/function/IntBinaryOperator.java → ...java/util/function/IntBinaryOperator.java b/...java/util/function/IntBinaryOperator.java → ...java/util/function/IntBinaryOperator.java
diff --git a/...loped/java/util/function/IntConsumer.java → ...loped/java/util/function/IntConsumer.java b/...loped/java/util/function/IntConsumer.java → ...loped/java/util/function/IntConsumer.java
diff --git a/...loped/java/util/function/IntFunction.java → ...loped/java/util/function/IntFunction.java b/...loped/java/util/function/IntFunction.java → ...loped/java/util/function/IntFunction.java
diff --git a/...oped/java/util/function/IntPredicate.java → ...oped/java/util/function/IntPredicate.java b/...oped/java/util/function/IntPredicate.java → ...oped/java/util/function/IntPredicate.java
diff --git a/...loped/java/util/function/IntSupplier.java → ...loped/java/util/function/IntSupplier.java b/...loped/java/util/function/IntSupplier.java → ...loped/java/util/function/IntSupplier.java
diff --git a/...va/util/function/IntToDoubleFunction.java → ...va/util/function/IntToDoubleFunction.java b/...va/util/function/IntToDoubleFunction.java → ...va/util/function/IntToDoubleFunction.java
diff --git a/...java/util/function/IntToLongFunction.java → ...java/util/function/IntToLongFunction.java b/...java/util/function/IntToLongFunction.java → ...java/util/function/IntToLongFunction.java
diff --git a/.../java/util/function/IntUnaryOperator.java → .../java/util/function/IntUnaryOperator.java b/.../java/util/function/IntUnaryOperator.java → .../java/util/function/IntUnaryOperator.java
diff --git a/...ava/util/function/LongBinaryOperator.java → ...ava/util/function/LongBinaryOperator.java b/...ava/util/function/LongBinaryOperator.java → ...ava/util/function/LongBinaryOperator.java
diff --git a/...oped/java/util/function/LongConsumer.java → ...oped/java/util/function/LongConsumer.java b/...oped/java/util/function/LongConsumer.java → ...oped/java/util/function/LongConsumer.java
diff --git a/...oped/java/util/function/LongFunction.java → ...oped/java/util/function/LongFunction.java b/...oped/java/util/function/LongFunction.java → ...oped/java/util/function/LongFunction.java
diff --git a/...ped/java/util/function/LongPredicate.java → ...ped/java/util/function/LongPredicate.java b/...ped/java/util/function/LongPredicate.java → ...ped/java/util/function/LongPredicate.java
diff --git a/...oped/java/util/function/LongSupplier.java → ...oped/java/util/function/LongSupplier.java b/...oped/java/util/function/LongSupplier.java → ...oped/java/util/function/LongSupplier.java
diff --git a/...a/util/function/LongToDoubleFunction.java → ...a/util/function/LongToDoubleFunction.java b/...a/util/function/LongToDoubleFunction.java → ...a/util/function/LongToDoubleFunction.java
diff --git a/...java/util/function/LongToIntFunction.java → ...java/util/function/LongToIntFunction.java b/...java/util/function/LongToIntFunction.java → ...java/util/function/LongToIntFunction.java
diff --git a/...java/util/function/LongUnaryOperator.java → ...java/util/function/LongUnaryOperator.java b/...java/util/function/LongUnaryOperator.java → ...java/util/function/LongUnaryOperator.java
diff --git a/...java/util/function/ObjDoubleConsumer.java → ...java/util/function/ObjDoubleConsumer.java b/...java/util/function/ObjDoubleConsumer.java → ...java/util/function/ObjDoubleConsumer.java
diff --git a/...ed/java/util/function/ObjIntConsumer.java → ...ed/java/util/function/ObjIntConsumer.java b/...ed/java/util/function/ObjIntConsumer.java → ...ed/java/util/function/ObjIntConsumer.java
diff --git a/...d/java/util/function/ObjLongConsumer.java → ...d/java/util/function/ObjLongConsumer.java b/...d/java/util/function/ObjLongConsumer.java → ...d/java/util/function/ObjLongConsumer.java
diff --git a/...veloped/java/util/function/Predicate.java → ...veloped/java/util/function/Predicate.java b/...veloped/java/util/function/Predicate.java → ...veloped/java/util/function/Predicate.java
diff --git a/...eveloped/java/util/function/Supplier.java → ...eveloped/java/util/function/Supplier.java b/...eveloped/java/util/function/Supplier.java → ...eveloped/java/util/function/Supplier.java
diff --git a/...ava/util/function/ToDoubleBiFunction.java → ...ava/util/function/ToDoubleBiFunction.java b/...ava/util/function/ToDoubleBiFunction.java → ...ava/util/function/ToDoubleBiFunction.java
diff --git a/.../java/util/function/ToDoubleFunction.java → .../java/util/function/ToDoubleFunction.java b/.../java/util/function/ToDoubleFunction.java → .../java/util/function/ToDoubleFunction.java
diff --git a/...d/java/util/function/ToIntBiFunction.java → ...d/java/util/function/ToIntBiFunction.java b/...d/java/util/function/ToIntBiFunction.java → ...d/java/util/function/ToIntBiFunction.java
diff --git a/...ped/java/util/function/ToIntFunction.java → ...ped/java/util/function/ToIntFunction.java b/...ped/java/util/function/ToIntFunction.java → ...ped/java/util/function/ToIntFunction.java
diff --git a/.../java/util/function/ToLongBiFunction.java → .../java/util/function/ToLongBiFunction.java b/.../java/util/function/ToLongBiFunction.java → .../java/util/function/ToLongBiFunction.java
diff --git a/...ed/java/util/function/ToLongFunction.java → ...ed/java/util/function/ToLongFunction.java b/...ed/java/util/function/ToLongFunction.java → ...ed/java/util/function/ToLongFunction.java
diff --git a/...ped/java/util/function/UnaryOperator.java → ...ped/java/util/function/UnaryOperator.java b/...ped/java/util/function/UnaryOperator.java → ...ped/java/util/function/UnaryOperator.java
diff --git a/src/jvm/jnetcore/pom.xml b/src/jvm/jnetcore/pom.xml
diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/generated/README.md b/src/jvm/jnetcore/src/main/java/org/mases/jnet/generated/README.md
diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj
@@ -42,7 +42,7 @@
 		<None Remove="Generated\**" />
 		<None Remove="Specific\**" />
 	</ItemGroup>
-	<ItemGroup>
+	<ItemGroup Condition="'$(GITHUB_SIMPLIFIED_GENERATION)' != 'true'">
 		<Compile Remove="Generated\Java\Util\Function\**" />
 		<None Remove="Generated\Java\Util\Function\**" />
 		<Compile Remove="Developed\Java\Lang\*Error.cs" />

diff --git a/src/net/JNet/JNetCoreBase.cs b/src/net/JNet/JNetCoreBase.cs
@@ -221,31 +221,7 @@ public sealed override IEnumerable<KeyValuePair<string, string>> JVMOptions
         /// <summary>
         /// A list of paths to be used in initialization of JVM ClassPath
         /// </summary>
-        protected virtual IList<string> PathToParse
-        {
-            get
-            {
-                var lst = new List<string>();
-
-                var assembly = typeof(JNetCoreBase<>).Assembly;
-                var version = assembly.GetName().Version.ToString();
-                // 1. check first full version
-                var jnetcoreFile = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(assembly.Location), JARsSubFolder, $"jnetcore-{version}.jar");
-                if (!System.IO.File.Exists(jnetcoreFile) && version.EndsWith(".0"))
-                {
-                    // 2. if not exist remove last part of version
-                    version = version.Substring(0, version.LastIndexOf(".0"));
-                    jnetcoreFile = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(assembly.Location), JARsSubFolder, $"jnetcore-{version}.jar");
-                }
-                if (!System.IO.File.Exists(jnetcoreFile))
-                {
-                    throw new System.IO.FileNotFoundException("Unable to identify JNet Core Jar location", jnetcoreFile);
-                }
-
-                lst.Add(jnetcoreFile);
-                return lst;
-            }
-        }
+        protected virtual IList<string> PathToParse => new List<string>();
 
         string buildClassPath()
         {