Merge branch 'master' into rewrite-ofxSvg

Author: NickHardeman

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 [*.sh]
-indent_style = tab
+indent_style = space
 indent_size = 4
 tab_width = 4
 insert_final_newline = true

.github/disabled/build-android.yml

@@ -22,11 +22,13 @@ jobs:
         cfg:
         - {target: android, gradle_target: compileArm7DebugSources}
         - {target: android, gradle_target: compileX86DebugSources}
+        - {target: android, gradle_target: compileArm64DebugSources}
+        - {target: android, gradle_target: compileX8664DebugSources}
 
     env:
       TARGET: ${{matrix.cfg.target}}
       GRADLE_TARGET: ${{matrix.cfg.gradle_target}}
-      NDK_DIR: android-ndk-r15c
+      NDK_DIR: android-ndk-r23b
     steps:
     - uses: actions/checkout@v3
     - name: Cache projectGenerator folder
@@ -37,7 +39,7 @@ jobs:
     - name: Cache NDK
       uses: actions/cache@v3
       with:
-        path: '~/android-ndk-r15c'
+        path: '~/android-ndk-r23b'
         key: ${{ runner.os }}-android-ndk-${{matrix.cfg.gradle_target}}
     - name: install
       run: ./scripts/ci/$TARGET/install.sh

.github/workflows/manual-nightly.yml .github/workflows/manual-release.yml.github/workflows/manual-nightly.yml renamed to .github/workflows/manual-release.yml

@@ -1,6 +1,6 @@
 # This one was created to make it work whil
 
-name: manual-nightly-ok
+name: manual-release
 
 on:
   workflow_dispatch:
@@ -67,8 +67,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.event.inputs.release }}
-          # release: ${{ github.event.inputs.release }}
-          release: nightly
+          release: ${{ github.event.inputs.release }}
           prerelease: false
           replace: true
           files: ${{ steps.createpackage.outputs.FILES_OUT }}

.github/workflows/nightly.yml

@@ -1,12 +1,23 @@
 name: nightly-linux64
 
+# #used for testing the nightly
+# on:
+#   push:
+#     paths-ignore:
+#       - "**/*.md"
+#       - "examples/**"
+#   pull_request:
+#     paths-ignore:
+#       - "**/*.md"
+#       - "examples/**"
+
 on:
  schedule:
   - cron: "0 6 * * *"
  workflow_dispatch:
     inputs:
       release:
-        description: 'release'     
+        description: 'release'
         required: true
         default: 'latest'
 env:
@@ -16,7 +27,7 @@ env:
 jobs:
   build-nightly-ok:
     runs-on: ubuntu-24.04
-    if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
+    # if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
     strategy:
       matrix:
         cfg:
@@ -49,12 +60,31 @@ jobs:
       id: createpackage
     - name: List output directory
       run: ls -lah out/
-    - name: Update Release
-      uses: IsaacShelton/update-existing-release@v1.3.4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag: nightly
-        release: nightly
-        prerelease: false
-        replace: true
-        files: ${{ steps.createpackage.outputs.FILES_OUT }}
+    # - name: Upload to GitHub Release
+    #   uses: softprops/action-gh-release@v2.1.0
+    #   with:
+    #     token: ${{ secrets.GITHUB_TOKEN }}
+    #     tag_name: "nightly"
+    #     files: |
+    #       out/of_v*.tar.gz
+    #       out/of_v*.zip
+    # Delete the existing release (but NOT the tag)
+    - name: Delete existing nightly release if exists
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release delete nightly --yes || true
+    # Recreate nightly release associated with existing tag
+    - name: Create new nightly release and upload assets
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release create nightly \
+          --title "Nightly Release" \
+          --notes "Auto-generated nightly build." \
+          out/of_v*.tar.gz out/of_v*.zip || \
+        gh release create nightly \
+          --title "Nightly Release" \
+          --notes "Auto-generated nightly build." \
+          --target ${{ github.sha }} \
+          out/of_v*.tar.gz out/of_v*.zip

.github/workflows/of.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Docker Step
-        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.74 bash"
+        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.4 bash"
       # - name: Determine Release
       #   id: vars
       #   shell: bash
@@ -77,11 +77,11 @@ jobs:
         run: gcc -v
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
+        uses: hendrikmuhs/ccache-action@v1.2.17
         with:
           # key: ${{ matrix.os }}-${{ matrix.type }}
           key: ${{ matrix.msystem }}
-      - uses: msys2/setup-msys2@v2.24.1
+      - uses: msys2/setup-msys2@v2.27.0
         with:
           cache: true
           release: true
@@ -125,7 +125,7 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
-      - uses: msys2/setup-msys2@v2.24.1
+      - uses: msys2/setup-msys2@v2.27.0
         with:
           update: true
           install: >-
@@ -171,8 +171,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
-        
-      - uses: msys2/setup-msys2@v2.24.1
+
+      - uses: msys2/setup-msys2@v2.27.0
         with:
           update: true
           install: >-
@@ -182,7 +182,7 @@ jobs:
       - name: Setup MSBuild (VS2019 - 16.11)
         uses: microsoft/setup-msbuild@v2
         with:
-          vs-version: '16.11'
+          vs-version: "16.11"
           msbuild-architecture: x64
 
       - name: Verify MSBuild Version
@@ -216,7 +216,6 @@ jobs:
       #     msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
       #     msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
 
-
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   rpi-build:
@@ -254,7 +253,7 @@ jobs:
           version: 1.0
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
+        uses: hendrikmuhs/ccache-action@v1.2.17
         with:
           key: ${{ matrix.cfg.libs }}
       # - name: Determine Release
@@ -294,7 +293,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
+        uses: hendrikmuhs/ccache-action@v1.2.17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
       # - name: Determine Release
@@ -331,10 +330,11 @@ jobs:
     env:
       TARGET: ${{matrix.cfg.target}}
     steps:
-      - name: Remove Old lib-unwind
-        run: if [ "$TARGET" = "linux64" ]; then
-          sudo apt-get remove libunwind-14 -y;
-          fi
+      # handled by the install script now
+      #      - name: Remove Old lib-unwind
+      #        run: if [ "$TARGET" = "linux64" ]; then
+      #          sudo apt-get remove libunwind-14 -y;
+      #          fi
       - name: Cache Packages
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
@@ -355,7 +355,7 @@ jobs:
       #     fi
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
+        uses: hendrikmuhs/ccache-action@v1.2.17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
@@ -394,7 +394,7 @@ jobs:
 
   #   - uses: actions/checkout@v4
   #   - name: ccache
-  #     uses: hendrikmuhs/ccache-action@v1.2.14
+  #     uses: hendrikmuhs/ccache-action@v1.2.17
   #     with:
   #       key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
@@ -422,7 +422,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
+        uses: hendrikmuhs/ccache-action@v1.2.17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
 
@@ -452,4 +452,54 @@ jobs:
         env:
           DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
           SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  build-android:
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        cfg:
+          - { target: android, opt: arm64-v8a }
+          - { target: android, opt: x86_64 }
+          - { target: android, opt: armeabi-v7a }
+
+    env:
+      TARGET: ${{ matrix.cfg.target }}
+      ARCH: ${{ matrix.cfg.opt }}
+      ANDROID_SDK_ROOT: $ANDROID_HOME
+      ANDROID_NDK_ROOT: $ANDROID_NDK_LATEST_HOME
+
+    steps:
+      - name: checkout openFrameworks
+        uses: actions/checkout@v4
+
+      - name: Set Up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Download Libraries
+        run: ./of update libs android
+
+      - name: Build openFrameworks Core - Debug
+        run: |
+          cd libs/openFrameworksCompiled/project/android/
+          gradle wrapper
+          chmod +x gradlew
+          ./gradlew assembleDebug
+
+      - name: Build openFrameworks Core - CMake
+        run: |
+          cd libs/openFrameworksCompiled/project/android/
+          ./cmake.sh ${ARCH}
+
+      - name: Check if openFrameworks output Exists
+        run: |
+          LIB_PATH="libs/openFrameworksCompiled/lib/android/${ARCH}/libopenFrameworksAndroid.so"
+          if [ -f "$LIB_PATH" ]; then
+            echo "Build Success - [$LIB_PATH]"
+          else
+            echo "ERROR: Build Failed not found: [$LIB_PATH]"
+            exit 1
+          fi

.gitignore

@@ -169,3 +169,4 @@ libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj.user
 libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj.user
 scripts/templates/vs/bin/emptyExample_debug.exe
 scripts/templates/vs2019/emptyExample.vcxproj.user
+libs/openFrameworksCompiled/project/android/build-*/