From 4c5a37f6e693b0f127538057edb34ade421ff809 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:19:03 +0200 Subject: [PATCH] Return back to single JAR --- .github/workflows/build.yaml | 14 -- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/docker.yaml | 7 - .github/workflows/generateclasses.yaml | 4 +- .github/workflows/pullrequest.yaml | 14 -- .github/workflows/release.yaml | 7 - .../org/mases/jnet/developed/JNetHelper.java | 0 .../jnet/developed/JNetReflectorHelper.java | 0 .../java/lang/UncaughtExceptionHandler.java | 0 .../jnet/developed/java/util/Comparator.java | 0 .../developed/java/util/EventListener.java | 0 .../java/util/function/BiConsumer.java | 0 .../java/util/function/BiFunction.java | 0 .../java/util/function/BiPredicate.java | 0 .../java/util/function/BinaryOperator.java | 0 .../java/util/function/BooleanSupplier.java | 0 .../java/util/function/Consumer.java | 0 .../util/function/DoubleBinaryOperator.java | 0 .../java/util/function/DoubleConsumer.java | 0 .../java/util/function/DoubleFunction.java | 0 .../java/util/function/DoublePredicate.java | 0 .../java/util/function/DoubleSupplier.java | 0 .../util/function/DoubleToIntFunction.java | 0 .../util/function/DoubleToLongFunction.java | 0 .../util/function/DoubleUnaryOperator.java | 0 .../java/util/function/Function.java | 0 .../java/util/function/IntBinaryOperator.java | 0 .../java/util/function/IntConsumer.java | 0 .../java/util/function/IntFunction.java | 0 .../java/util/function/IntPredicate.java | 0 .../java/util/function/IntSupplier.java | 0 .../util/function/IntToDoubleFunction.java | 0 .../java/util/function/IntToLongFunction.java | 0 .../java/util/function/IntUnaryOperator.java | 0 .../util/function/LongBinaryOperator.java | 0 .../java/util/function/LongConsumer.java | 0 .../java/util/function/LongFunction.java | 0 .../java/util/function/LongPredicate.java | 0 .../java/util/function/LongSupplier.java | 0 .../util/function/LongToDoubleFunction.java | 0 .../java/util/function/LongToIntFunction.java | 0 .../java/util/function/LongUnaryOperator.java | 0 .../java/util/function/ObjDoubleConsumer.java | 0 .../java/util/function/ObjIntConsumer.java | 0 .../java/util/function/ObjLongConsumer.java | 0 .../java/util/function/Predicate.java | 0 .../java/util/function/Supplier.java | 0 .../util/function/ToDoubleBiFunction.java | 0 .../java/util/function/ToDoubleFunction.java | 0 .../java/util/function/ToIntBiFunction.java | 0 .../java/util/function/ToIntFunction.java | 0 .../java/util/function/ToLongBiFunction.java | 0 .../java/util/function/ToLongFunction.java | 0 .../java/util/function/UnaryOperator.java | 0 src/jvm/jnetcore/pom.xml | 213 ------------------ .../java/org/mases/jnet/generated/README.md | 3 - src/net/JNet/JNet.csproj | 2 +- src/net/JNet/JNetCoreBase.cs | 26 +-- 58 files changed, 5 insertions(+), 289 deletions(-) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/JNetHelper.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/JNetReflectorHelper.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/lang/UncaughtExceptionHandler.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/Comparator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/EventListener.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/BiConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/BiFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/BiPredicate.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/BinaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/BooleanSupplier.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/Consumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleBinaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoublePredicate.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleSupplier.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToIntFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToLongFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/DoubleUnaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/Function.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntBinaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntPredicate.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntSupplier.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntToDoubleFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntToLongFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/IntUnaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongBinaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongPredicate.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongSupplier.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongToDoubleFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongToIntFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/LongUnaryOperator.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ObjDoubleConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ObjIntConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ObjLongConsumer.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/Predicate.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/Supplier.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleBiFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToIntBiFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToIntFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToLongBiFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/ToLongFunction.java (100%) rename src/jvm/{jnetcore => jnet}/src/main/java/org/mases/jnet/developed/java/util/function/UnaryOperator.java (100%) delete mode 100644 src/jvm/jnetcore/pom.xml delete mode 100644 src/jvm/jnetcore/src/main/java/org/mases/jnet/generated/README.md diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7c582c37ad..71a1f32da1 100644 --- 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 index d2076f480d..0a19999b10 100644 --- 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 index 59454d9494..a0e0d9375c 100644 --- 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 index e822e6d4d5..8389f3a61c 100644 --- 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 index b39c762d3d..d300a66bf2 100644 --- 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 index 34ff8c151f..1b060a4852 100644 --- 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/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/JNetHelper.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetHelper.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/JNetHelper.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetHelper.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/JNetReflectorHelper.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetReflectorHelper.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/JNetReflectorHelper.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetReflectorHelper.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/lang/UncaughtExceptionHandler.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/lang/UncaughtExceptionHandler.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/lang/UncaughtExceptionHandler.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/lang/UncaughtExceptionHandler.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/Comparator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/Comparator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/Comparator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/Comparator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/EventListener.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/EventListener.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/EventListener.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/EventListener.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiPredicate.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiPredicate.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BiPredicate.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BiPredicate.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BinaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BinaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BinaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BinaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BooleanSupplier.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BooleanSupplier.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/BooleanSupplier.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/BooleanSupplier.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Consumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Consumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Consumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Consumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleBinaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleBinaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleBinaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleBinaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoublePredicate.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoublePredicate.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoublePredicate.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoublePredicate.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleSupplier.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleSupplier.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleSupplier.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleSupplier.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToIntFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToIntFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToIntFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToIntFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToLongFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToLongFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToLongFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleToLongFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleUnaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleUnaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/DoubleUnaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/DoubleUnaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Function.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Function.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Function.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Function.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntBinaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntBinaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntBinaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntBinaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntPredicate.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntPredicate.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntPredicate.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntPredicate.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntSupplier.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntSupplier.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntSupplier.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntSupplier.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntToDoubleFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntToDoubleFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntToDoubleFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntToDoubleFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntToLongFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntToLongFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntToLongFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntToLongFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntUnaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntUnaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/IntUnaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/IntUnaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongBinaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongBinaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongBinaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongBinaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongPredicate.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongPredicate.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongPredicate.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongPredicate.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongSupplier.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongSupplier.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongSupplier.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongSupplier.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongToDoubleFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongToDoubleFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongToDoubleFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongToDoubleFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongToIntFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongToIntFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongToIntFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongToIntFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongUnaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongUnaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/LongUnaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/LongUnaryOperator.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjDoubleConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjDoubleConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjDoubleConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjDoubleConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjIntConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjIntConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjIntConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjIntConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjLongConsumer.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjLongConsumer.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ObjLongConsumer.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ObjLongConsumer.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Predicate.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Predicate.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Predicate.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Predicate.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Supplier.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Supplier.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/Supplier.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/Supplier.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleBiFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleBiFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleBiFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleBiFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToDoubleFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToIntBiFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToIntBiFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToIntBiFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToIntBiFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToIntFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToIntFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToIntFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToIntFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToLongBiFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToLongBiFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToLongBiFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToLongBiFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToLongFunction.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToLongFunction.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/ToLongFunction.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/ToLongFunction.java diff --git a/src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/UnaryOperator.java b/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/UnaryOperator.java similarity index 100% rename from src/jvm/jnetcore/src/main/java/org/mases/jnet/developed/java/util/function/UnaryOperator.java rename to src/jvm/jnet/src/main/java/org/mases/jnet/developed/java/util/function/UnaryOperator.java diff --git a/src/jvm/jnetcore/pom.xml b/src/jvm/jnetcore/pom.xml deleted file mode 100644 index c0a684aa46..0000000000 --- a/src/jvm/jnetcore/pom.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - 4.0.0 - - com.masesgroup - jnetcore - mases.jnetcore - JNet-Java interface bridging implementation - https://github.com/masesgroup/JNet - ${jnetversion} - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - https://github.com/masesgroup/JNet/issues - GitHub Issues - - - https://github.com/masesgroup/JNet - scm:git:git://github.com/masesgroup/JNet.git - scm:git:git@github.com:masesgroup/JNet.git - - - - info@masesgroup.com - MASES Group - https://github.com/masesgroup - masesgroup - - - - 11 - 11 - ${basedir}/classpathfile.classpath - 2.5.8.0 - ../../../bin/net8.0/JCOBridge.jar - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - Central Repository OSSRH - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.8.0 - - - build-classpath - generate-sources - - build-classpath - - - ${classpathfile} - - - - copy-dependencies - package - - copy-dependencies - - - ${basedir}/../../../jars/ - false - false - true - - - - copy-installed - package - - copy - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - - - ${basedir}/../../../jars/ - true - - - - - - org.codehaus.gmaven - gmaven-plugin - 1.5 - - - generate-resources - - execute - - - - def file = new File(project.properties.classpathfile) - project.properties.originalClassPath = file.getText() - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - -cp - ${originalClassPath}${path.separator}${basedir}/${jcobridgepath} - - 11 - 11 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - **/target/ - **/*.xml - **/*.zip - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.5 - - - --pinentry-mode - loopback - - - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - - - - - org.burningwave - core - 12.65.1 - - - 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 deleted file mode 100644 index 84ad5853d5..0000000000 --- a/src/jvm/jnetcore/src/main/java/org/mases/jnet/generated/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Java Generated classes - -This folder contains the Java classes generated using JNetReflector at the same version of JNet. diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj index 914496848d..a2fd9d775c 100644 --- a/src/net/JNet/JNet.csproj +++ b/src/net/JNet/JNet.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/net/JNet/JNetCoreBase.cs b/src/net/JNet/JNetCoreBase.cs index 94ebc26538..5d6faccd0b 100644 --- a/src/net/JNet/JNetCoreBase.cs +++ b/src/net/JNet/JNetCoreBase.cs @@ -221,31 +221,7 @@ public sealed override IEnumerable> JVMOptions /// /// A list of paths to be used in initialization of JVM ClassPath /// - protected virtual IList PathToParse - { - get - { - var lst = new List(); - - 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 PathToParse => new List(); string buildClassPath() {