Merge branch 'main' into moo-1825/fix-get-current-location

Author: stelselim

Diff for: .github/actions/create-native-bundle/action.yml

@@ -31,7 +31,7 @@ runs:
         mkdir -p ${{ inputs.platform }}/assets
         cd Native-Mobile-Resources-main/deployment/native && \
         /tmp/mxbuild/modeler/tools/node/linux-x64/node \
-        /tmp/mxbuild/modeler/tools/node/node_modules/react-native/local-cli/cli.js \
+        /tmp/mxbuild/modeler/tools/node/node_modules/react-native/cli.js \
         bundle --verbose --platform ${{ inputs.platform }} --dev false \
         --config "$PWD/metro.config.js" \
         --bundle-output $GITHUB_WORKSPACE/${{ inputs.platform }}/index.${{ inputs.platform }}.bundle \

Diff for: .github/actions/start-runtime/action.yml

@@ -17,12 +17,12 @@ runs:
     - name: "Install Python dependencies"
       run: pip install pyaml httplib2
       shell: bash
-    - name: "Setup Java 11"
+    - name: "Setup Java 21"
       id: setup-java
-      uses: actions/setup-java@v3.10.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 #v4
       with:
         distribution: "temurin"
-        java-version: "11"
+        java-version: "21"
     - name: "Extract deployment package"
       run: |
         mkdir project
@@ -50,4 +50,4 @@ runs:
       shell: bash
     - name: "Start mxruntime"
       run: bin/m2ee -c ${{ github.workspace }}/project/m2ee-native.yml --verbose --yolo start
-      shell: bash
+      shell: bash

Diff for: .github/scripts/mxbuild.Dockerfile

@@ -2,30 +2,31 @@ FROM mcr.microsoft.com/dotnet/runtime:8.0
 ARG MENDIX_VERSION
 
 RUN \
-    echo "Installing Java 17..." && \
+    echo "Installing Java 21..." && \
     apt-get -qq update && \
     apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
+    wget -q https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz || { echo "Failed to download Java 21"; exit 1; } && \
     mkdir -p /usr/lib/jvm && \
-    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
-    mv /usr/lib/jvm/jdk-17.0.2 /usr/lib/jvm/java-17-openjdk && \
-    rm /tmp/openjdk.tar.gz  
+    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm || { echo "Failed to extract Java 21"; exit 1; } && \
+    ls /usr/lib/jvm && \
+    mv /usr/lib/jvm/jdk-21* /usr/lib/jvm/java-21-openjdk && \
+    rm /tmp/openjdk.tar.gz
 
 RUN \
     echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
-    wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz && \
+    wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz || { echo "Failed to download mxbuild"; exit 1; } && \
     mkdir /tmp/mxbuild && \
-    tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
-    rm /tmp/mxbuild.tar.gz 
+    tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild || { echo "Failed to extract mxbuild"; exit 1; } && \
+    rm /tmp/mxbuild.tar.gz
 
 RUN \
     apt-get -qq remove -y wget && \
-    apt-get clean 
+    apt-get clean
 
 RUN \
     echo "#!/bin/bash -x" >/bin/mxbuild && \
-    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/java-17-openjdk --java-exe-path=/usr/lib/jvm/java-17-openjdk/bin/java \$@" >>/bin/mxbuild && \
-    chmod +x /bin/mxbuild  
+    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/java-21-openjdk --java-exe-path=/usr/lib/jvm/java-21-openjdk/bin/java \$@" >>/bin/mxbuild && \
+    chmod +x /bin/mxbuild
 
 RUN \
     echo "#!/bin/bash -x" >/bin/mx && \

Diff for: .github/workflows/NativeAutomatedTestsAndroid.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       #     - name: "Checking changed files"
       #       id: files
-      #       uses: softprops/diffset@v1
+      #       uses: softprops/diffset@d5947696689a571f7a984a52505e2649eead5c22 # v1
       #       if:
       #           github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name ==
       #           github.repository
@@ -49,7 +49,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> ${{ runner.os == 'Windows' && '$env:GITHUB_ENV' || '$GITHUB_ENV' }}
       - name: "Defining cache"
-        uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed # v2
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
         env:
           cache-name: cache-node-modules
         with: