Change to corretto

Update to new github permissions

.github/workflows/build-all.yml

@@ -15,6 +15,8 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       release_tag_name: ${{ env.release_tag_name }}
       build_meta: ${{ env.build_meta }}
@@ -50,6 +52,8 @@ jobs:
   build-linux-amd64:
     runs-on: ubuntu-latest
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -75,6 +79,8 @@ jobs:
   build-linux-arm64:
     runs-on: ubuntu-latest
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -100,6 +106,8 @@ jobs:
   build-linux-arm:
     runs-on: ubuntu-latest
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -123,8 +131,10 @@ jobs:
 
 
   build-windows-amd64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       -
@@ -141,8 +151,10 @@ jobs:
 
 
   build-windows-i386:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       -
@@ -159,8 +171,10 @@ jobs:
           
   
   build-windows-arm64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       -
@@ -177,8 +191,10 @@ jobs:
 
 
   build-macosx-amd64:
-    runs-on: macos-12
+    runs-on: macos-latest
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       -
@@ -190,7 +206,10 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'corretto'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -242,8 +261,10 @@ jobs:
 
 
   build-macosx-arm64:
-    runs-on: macos-12
+    runs-on: macos-latest
     needs: create-release
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       -
@@ -255,7 +276,10 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'corretto'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}

.github/workflows/build-linux-amd64.yml

@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-linux-arm.yml

@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh arm/v6 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-arm.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-linux-arm64.yml

@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-macosx-amd64.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-macosx-amd64:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       -
@@ -26,7 +26,10 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'corretto'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -66,7 +69,7 @@ jobs:
           rm -rf "${HOME}/private_keys"
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macosx-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-macosx-arm64.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-macosx-arm64:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       -
@@ -26,7 +26,10 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'corretto'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10.11'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -66,7 +69,7 @@ jobs:
           rm -rf "${HOME}/private_keys"
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macosx-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-amd64.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-windows-amd64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v3
       -
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-arm64.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-windows-arm64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v3
       -
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-i386.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-windows-i386:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v3
       -
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-i386.tar.gz
           path: out/binary_distrib.tar.gz

DockerfileLinux

@@ -32,7 +32,7 @@ RUN ./run_linux.sh
 #Export built files
 FROM scratch AS export-stage
 COPY --from=stage /jcef/binary_distrib.tar.gz .
-COPY --from=stage /jcef/target target
+#COPY --from=stage /jcef/target target
-COPY --from=stage /jcef/third_party third_party
+#COPY --from=stage /jcef/third_party third_party
-COPY --from=stage /jcef/buildtools buildtools
+#COPY --from=stage /jcef/buildtools buildtools
-COPY --from=stage /jcef/jcef_build jcef_build
+#COPY --from=stage /jcef/jcef_build jcef_build

compile_linux.sh

@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
 fi
 
 #Move jcef_build
-rm -rf jcef/jcef_build
+if [ -f "out/jcef_build" ]; then
-mv out/jcef_build jcef/jcef_build
+    rm -rf jcef/jcef_build
+    mv out/jcef_build jcef/jcef_build
+fi
 
 #Move target to binary_distrib
-rm -rf jcef/binary_distrib
+if [ -f "out/target" ]; then
-mv out/target jcef/binary_distrib
+    rm -rf jcef/binary_distrib
+    mv out/target jcef/binary_distrib
+fi

compile_macosx.sh

@@ -64,6 +64,7 @@ ninja -j4
 
 #Generate distribution
 cd ../tools
+sed -i "" 's/--ignore-source-errors//g' make_docs.sh
 chmod +x make_distrib.sh
 ./make_distrib.sh macosx64
 cd ..

macosx_codesign.sh

@@ -28,6 +28,7 @@ chmod +x macosx_codesign_zip.sh
 
 #Sign helpers
 echo "Signing helpers..."
+cd "$( dirname "$0" )"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app" "$2" $3 org.jcef.jcef.helper $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (GPU).app"
@@ -36,14 +37,16 @@ codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Plugin).app" "$2" $3 org.jcef.jcef.helper.plugin $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Renderer).app"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Renderer).app" "$2" $3 org.jcef.jcef.helper.renderer $4 $5 $6
+codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Alerts).app"
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Alerts).app" "$2" $3 org.jcef.jcef.helper.alerts $4 $5 $6
 
 #Sign libraries and framework
 echo "Signing libraries and framework..."
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libEGL.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libGLESv2.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libvk_swiftshader.dylib"
+codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Chromium Embedded Framework"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME" "$2" $3 org.cef.framework $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/Contents/Java/libjcef.dylib"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/gluegen-rt-natives-macosx-universal.jar" "natives/macosx-universal/libgluegen_rt.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnativewindow_awt.dylib" "$2"
@@ -51,6 +54,7 @@ bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-m
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libjogl_mobile.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnewt_head.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libjogl_desktop.dylib" "$2"
+codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/Contents/MacOS/JavaAppLauncher"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME" "$2" $3 org.jcef.jcef $4 $5 $6
 

scripts/install_macos_dependencies.sh

@@ -1,3 +1,9 @@
 #!/bin/bash
 
+PYTHON=python3
+
 brew install ninja
+brew install six
+
+"$PYTHON" -m pip list
+echo "from six.moves import configparser" | "$PYTHON" && echo "Success importing stuff from six moves python module"

scripts/run_windows.bat

@@ -19,9 +19,9 @@ python C:/patch_cmake.py CMakeLists.txt C:/CMakeLists.txt.patch
 mkdir jcef_build && cd jcef_build
 
 :: Load vcvars for 32 or 64-bit builds
-if "%TARGETARCH%"=="386" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat")
+if "%TARGETARCH%"=="386" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars32.bat")
-if "%TARGETARCH%"=="amd64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat")
+if "%TARGETARCH%"=="amd64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat")
-if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsamd64_arm64.bat")
+if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_arm64.bat")
 
 :: Edit PATH variable on 386 to use 32 bit jdk (cmake findjni does not actually care about JAVA_HOME)
 if "%TARGETARCH%"=="386" (set "PATH=C:/Program Files (x86)/Java/jdk1.8.0_211;%PATH%")