diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 11e69e2a13..7c582c37ad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,7 +90,14 @@ 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 + - 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: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} @@ -166,6 +173,13 @@ 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 0a19999b10..d2076f480d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -131,7 +131,9 @@ jobs: GITHUB_SIMPLIFIED_GENERATION: true - if: matrix.language == 'java' - run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package + run: | + mvn --file ./src/jvm/jnetcore/pom.xml --no-transfer-progress package + 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 41e0a8e16e..59454d9494 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -38,7 +38,14 @@ 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 + - 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: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml index a72ae3aded..299722d61a 100644 --- a/.github/workflows/generateclasses.yaml +++ b/.github/workflows/generateclasses.yaml @@ -55,10 +55,14 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Clear C# generated files - run: Remove-Item .\src\net\JNet\Generated\* -Recurse -Force -Exclude README.md + run: | + Remove-Item .\src\net\JNet\GeneratedCore\* -Recurse -Force -Exclude README.md + Remove-Item .\src\net\JNet\Generated\* -Recurse -Force -Exclude README.md - name: Clear Java generated files - run: Remove-Item .\src\jvm\jnet\src\main\java\org\mases\jnet\generated\* -Recurse -Force -Exclude README.md + run: | + Remove-Item .\src\jvm\jnetcore\src\main\java\org\mases\jnet\generated\* -Recurse -Force -Exclude README.md + Remove-Item .\src\jvm\jnet\src\main\java\org\mases\jnet\generated\* -Recurse -Force -Exclude README.md - run: dotnet build --no-incremental --configuration Release src\net\JNetReflector\JNetReflector.csproj @@ -66,6 +70,7 @@ jobs: shell: cmd run: | cd binReflector\net8.0 + MASES.JNetReflector.exe -TraceLevel 0 -DestinationRootPath ..\..\src\ -ConfigurationFile ..\..\src\configurationCore.json MASES.JNetReflector.exe -TraceLevel 0 -DestinationRootPath ..\..\src\ -ConfigurationFile ..\..\src\configuration.json env: JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index e7682576a4..b39c762d3d 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -90,7 +90,14 @@ 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 + - 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: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} @@ -139,7 +146,14 @@ 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 + - 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: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ca3dd028f7..34ff8c151f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -45,7 +45,14 @@ 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 + - 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: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} diff --git a/src/net/JNet/GeneratedCore/README.md b/src/net/JNet/GeneratedCore/README.md new file mode 100644 index 0000000000..456dab462d --- /dev/null +++ b/src/net/JNet/GeneratedCore/README.md @@ -0,0 +1,3 @@ +## C# Generated classes + +This folder contains the C# classes, reflected from Java, generated using JNetReflector at the same version of JNet.