Merge branch 'main' into main-gradle

Author: Stefterv

.github/workflows/pull_request.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup Ant
         uses: cedx/setup-ant@v3
       - name: Build Release
-        run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}"
+        run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" -Dplatform=${{ matrix.os_prefix }}
       - name: Add artifact
         uses: actions/upload-artifact@v3
         id: upload