Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 86 additions & 32 deletions .github/workflows/build_and_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Set up MinGW
uses: msys2/setup-msys2@v2
Expand All @@ -51,16 +51,28 @@ jobs:
value: $env:PATH;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build

- name: Build idl-helper project
run: ./gradlew idl_helper_build_project_windows64
run: ./gradlew idl_helper_build_project_jni_windows64

- name: Build idl-helper FFM project
run: ./gradlew idl_helper_build_project_ffm_windows64

- name: Build TestLib project
run: ./gradlew TestLib_build_project_windows64
run: ./gradlew TestLib_build_project_jni_windows64

- name: Build TestLib FFM project
run: ./gradlew TestLib_build_project_ffm_windows64

- name: Build Shared LibA project
run: ./gradlew LibA_build_project_windows64
run: ./gradlew LibA_build_project_jni_windows64

- name: Build Shared LibA FFM project
run: ./gradlew LibA_build_project_ffm_windows64

- name: Build Shared LibB project
run: ./gradlew LibB_build_project_windows64
run: ./gradlew LibB_build_project_jni_windows64

- name: Build Shared LibB FFM project
run: ./gradlew LibB_build_project_ffm_windows64

# - name: Test Shared Lib
# run: ./gradlew :examples:SharedLib:app:core:test
Expand All @@ -84,11 +96,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Set up MinGW
run: |
Expand All @@ -98,16 +110,28 @@ jobs:
run: chmod +x ./gradlew

- name: Build idl-helper project
run: ./gradlew idl_helper_build_project_linux64
run: ./gradlew idl_helper_build_project_jni_linux64

- name: Build idl-helper FFM project
run: ./gradlew idl_helper_build_project_ffm_linux64

- name: Build TestLib project
run: ./gradlew TestLib_build_project_linux64
run: ./gradlew TestLib_build_project_jni_linux64

- name: Build TestLib FFM project
run: ./gradlew TestLib_build_project_ffm_linux64

- name: Build Shared LibA project
run: ./gradlew LibA_build_project_linux64
run: ./gradlew LibA_build_project_jni_linux64

- name: Build Shared LibA FFM project
run: ./gradlew LibA_build_project_ffm_linux64

- name: Build Shared LibB project
run: ./gradlew LibB_build_project_linux64
run: ./gradlew LibB_build_project_jni_linux64

- name: Build Shared LibB FFM project
run: ./gradlew LibB_build_project_ffm_linux64

# - name: Test Shared Lib
# run: ./gradlew :examples:SharedLib:app:core:test
Expand All @@ -131,29 +155,44 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Change wrapper permissions
run: chmod +x ./gradlew

- name: Build project idl-helper
run: ./gradlew idl_helper_build_project_mac64
run: ./gradlew idl_helper_build_project_jni_mac64

- name: Build idl-helper FFM project
run: ./gradlew idl_helper_build_project_ffm_mac64

- name: Build TestLib project
run: |
./gradlew TestLib_build_project_mac64
./gradlew TestLib_build_project_jni_mac64

- name: Build TestLib FFM project
run: |
./gradlew TestLib_build_project_ffm_mac64

# - name: Build Shared LibA project
# run: |
# ./gradlew LibA_build_project_mac64
# ./gradlew LibA_build_project_jni_mac64
#
# - name: Build Shared LibA FFM project
# run: |
# ./gradlew LibA_build_project_ffm_mac64
#
# - name: Build Shared LibB project
# run: |
# ./gradlew LibB_build_project_mac64
# ./gradlew LibB_build_project_jni_mac64
#
# - name: Build Shared LibB FFM project
# run: |
# ./gradlew LibB_build_project_ffm_mac64

# - name: Test Shared Lib
# run: ./gradlew :examples:SharedLib:app:core:test
Expand All @@ -177,29 +216,44 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Change wrapper permissions
run: chmod +x ./gradlew

- name: Build project idl-helper
run: ./gradlew idl_helper_build_project_macArm
run: ./gradlew idl_helper_build_project_jni_macArm

- name: Build idl-helper FFM project
run: ./gradlew idl_helper_build_project_ffm_macArm

- name: Build TestLib project
run: |
./gradlew TestLib_build_project_macArm
./gradlew TestLib_build_project_jni_macArm

- name: Build TestLib FFM project
run: |
./gradlew TestLib_build_project_ffm_macArm

# - name: Build Shared LibA project
# run: |
# ./gradlew LibA_build_project_macArm
# ./gradlew LibA_build_project_jni_macArm
#
# - name: Build Shared LibA FFM project
# run: |
# ./gradlew LibA_build_project_ffm_macArm
#
# - name: Build Shared LibB project
# run: |
# ./gradlew LibB_build_project_macArm
# ./gradlew LibB_build_project_jni_macArm
#
# - name: Build Shared LibB FFM project
# run: |
# ./gradlew LibB_build_project_ffm_macArm

# - name: Test Shared Lib
# run: ./gradlew :examples:SharedLib:app:core:test
Expand All @@ -223,11 +277,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Set up MinGW
run: |
Expand Down Expand Up @@ -266,11 +320,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Set up MinGW
run: |
Expand All @@ -289,12 +343,12 @@ jobs:
run: chmod +x ./gradlew

- name: Build project idl-helper
run: ./gradlew idl_helper_build_project_android
run: ./gradlew idl_helper_build_project_jni_android
env:
NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

- name: Build project
run: ./gradlew TestLib_build_project_android
run: ./gradlew TestLib_build_project_jni_android
env:
NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

Expand Down Expand Up @@ -326,11 +380,11 @@ jobs:
property: version
default: 0.0.1

- name: Set up JDK 17
- name: Set up JDK 24
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: 17
java-version: 24

- name: Set up MinGW
run: |
Expand Down
19 changes: 18 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,33 @@ out/

**/idl-helper/idl-helper-teavm/src/main/java/**
**/idl-helper/idl-helper-core/src/main/java/**
**/idl-helper/idl-helper-desktop-ffm/src/main/java/**
**/idl-helper/idl-helper-desktop-jni/src/main/java/**
**/idl-helper/idl-helper-android/src/main/java/**

**/webapp/**
**/lib/core/src/**
**/lib/desktop/src/main/**

**/lib/lib-teavm/src/main/java/**
**/lib/lib-core/src/main/java/**
**/lib/lib-desktop-ffm/src/main/java/**
**/lib/lib-desktop-jni/src/main/java/**
**/lib/lib-android/src/main/java/**

**/libA/lib-teavm/src/main/java/**
**/libA/lib-core/src/main/java/**
**/libA/lib-desktop-ffm/src/main/java/**
**/libA/lib-desktop-jni/src/main/java/**
**/libA/lib-android/src/main/java/**
**/libB/lib-teavm/src/main/java/**
**/libB/lib-core/src/main/java/**
**/libB/lib-desktop-ffm/src/main/java/**
**/libB/lib-desktop-jni/src/main/java/**
**/libB/lib-android/src/main/java/**

**/app/android/libs/
.codiumai
.kotlin/
.kotlin/

LOCAL_AGENT.MD
24 changes: 0 additions & 24 deletions .run/LibA_build_project_android.run.xml

This file was deleted.

27 changes: 0 additions & 27 deletions .run/LibA_build_project_linux64.run.xml

This file was deleted.

27 changes: 0 additions & 27 deletions .run/LibA_build_project_mac64.run.xml

This file was deleted.

Loading
Loading