Merge pull request #6 from paulocoutinhox/new-version

update to cef version 121

.github/workflows/linux-arm.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 

.github/workflows/linux.yml

@@ -28,7 +28,7 @@ jobs:
         run: sudo apt-get install build-essential libgtk2.0-dev libgtkglext1-dev
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 

.github/workflows/macos.yml

@@ -36,7 +36,7 @@ jobs:
         run: brew install create-dmg
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -63,27 +63,28 @@ jobs:
           cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCEF_PLATFORM=${{ matrix.config.cef_platform }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.osx_arch }} -DPROJECT_ARCH=${{ matrix.config.project_arch }} -G "Xcode"
           cmake --build build --target MyApp --config Release -v
 
-      - name: "Import certificate"
-        uses: devbotsxyz/import-signing-certificate@main
+      - name: Install application certificate
+        uses: apple-actions/import-codesign-certs@v2
         with:
-          certificate-data: ${{ secrets.MACOS_CERTIFICATE }}
-          certificate-passphrase: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-          keychain-password: ${{ secrets.KEYCHAIN_PWD }}
+          keychain: ${{ github.run_id }}
+          keychain-password: ${{ github.run_id }}
+          p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
+          p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
 
       - name: Codesign application
         run: |
           security find-identity -v
-          python codesign.py "Developer ID Application: Paulo Coutinho (99AHAA343Q)" "build/Release/MyApp.app" "app/resources/macos/entitlements.plist" -v
+          python3 codesign.py "Developer ID Application: Paulo Coutinho (99AHAA343Q)" "build/Release/MyApp.app" "app/resources/macos/entitlements.plist" -v
 
       - name: Create DMG
         run: |
-          python make.py dmg-build
+          python3 make.py dmg-build
           mv "MyApp.dmg" ${{ matrix.config.target }}-${{ matrix.config.cef_platform }}.dmg
 
       - name: Codesign DMG
         run: |
           security find-identity -v
-          python codesign.py "Developer ID Application: Paulo Coutinho (99AHAA343Q)" "${{ matrix.config.target }}-${{ matrix.config.cef_platform }}.dmg" "app/resources/macos/entitlements.plist" -v
+          python3 codesign.py "Developer ID Application: Paulo Coutinho (99AHAA343Q)" "${{ matrix.config.target }}-${{ matrix.config.cef_platform }}.dmg" "app/resources/macos/entitlements.plist" -v
 
       - name: Notarize build
         env:

.github/workflows/windows.yml

@@ -49,7 +49,7 @@ jobs:
           arch: ${{ matrix.config.msvc_arch }}
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 

CMakeLists.txt

@@ -9,7 +9,7 @@ project("MyApp")
 
 # CEF configuration
 set_property(GLOBAL PROPERTY OS_FOLDERS ON)
-set(CEF_VERSION "114.2.10+g398e3c3+chromium-114.0.5735.110")
+set(CEF_VERSION "120.2.7+g4bc6a59+chromium-120.0.6099.234")
 
 # Determine the platform
 if(NOT DEFINED CEF_PLATFORM)

README.md

@@ -27,7 +27,7 @@ You can download a compiled version for your system on releases page or actions
 
 You can change CEF_VERSION variable inside CMakeLists.txt.
 
-Example of valid version: `114.2.10+g398e3c3+chromium-114.0.5735.110`.
+Example of valid version: `120.2.7+g4bc6a59+chromium-120.0.6099.234`.
 
 Visit https://cef-builds.spotifycdn.com/index.html for the list of supported platforms and versions.
 
@@ -83,3 +83,11 @@ Other option is publish your application on Microsoft Store. See some tutorials:
 * https://docs.microsoft.com/windows/msix/packaging-tool/create-an-msix-overview
 * https://docs.microsoft.com/windows/win32/win_cert/windows-certification-portal
 * https://www.electronjs.org/docs/tutorial/windows-store-guide
+
+## License
+
+This license informations is about this personal project, not the CEF Library.
+
+[MIT](http://opensource.org/licenses/MIT)
+
+Copyright (c) 2021-2024, Paulo Coutinho

app/include/main/binding/AppBinding.hpp

@@ -18,14 +18,14 @@ class AppBinding : public CefMessageRouterBrowserSide::Handler
     virtual ~AppBinding() {}
 
     // called due to cefQuery execution
-    virtual bool OnQuery(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback) override;
+    virtual bool OnQuery(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback) override;
 
     // called on AppClient
     static void init(CefRefPtr<CefMessageRouterBrowserSide> router);
 
     // tasks
-    bool onTaskReverseData(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage);
-    bool onTaskNetworkRequest(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage);
+    bool onTaskReverseData(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage);
+    bool onTaskNetworkRequest(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage);
 
     // callback
     void onRequestComplete(CefRefPtr<Callback> callback, CefURLRequest::ErrorCode errorCode, const std::string &downloadData);

app/include/main/net/RequestClient.hpp

@@ -27,17 +27,17 @@ class RequestClient : public CefURLRequestClient
     virtual ~RequestClient();
 
     void OnRequestComplete(CefRefPtr<CefURLRequest> request) override;
-    void OnUploadProgress(CefRefPtr<CefURLRequest> request, int64 current, int64 total) override;
-    void OnDownloadProgress(CefRefPtr<CefURLRequest> request, int64 current, int64 total) override;
+    void OnUploadProgress(CefRefPtr<CefURLRequest> request, int64_t current, int64_t total) override;
+    void OnDownloadProgress(CefRefPtr<CefURLRequest> request, int64_t current, int64_t total) override;
     void OnDownloadData(CefRefPtr<CefURLRequest> request, const void *data, size_t dataLength) override;
     bool GetAuthCredentials(bool isProxy, const CefString &host, int port, const CefString &realm, const CefString &scheme, CefRefPtr<CefAuthCallback> callback) override;
 
     void detach();
     const std::string &getDownloadData();
 
 private:
-    int64 uploadTotal;
-    int64 downloadTotal;
+    int64_t uploadTotal;
+    int64_t downloadTotal;
     std::string downloadData;
 
     RequestCallback requestCallback;

app/src/main/binding/AppBinding.cpp

@@ -9,7 +9,7 @@ namespace app
 namespace binding
 {
 
-bool AppBinding::OnQuery(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback)
+bool AppBinding::OnQuery(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback)
 {
     // only handle messages from application url
     const std::string &url = frame->GetURL();
@@ -42,7 +42,7 @@ bool AppBinding::OnQuery(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> fram
     return false;
 }
 
-bool AppBinding::onTaskNetworkRequest(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage)
+bool AppBinding::onTaskNetworkRequest(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage)
 {
     // create a CefRequest object
     CefRefPtr<CefRequest> httpRequest = CefRequest::Create();
@@ -79,7 +79,7 @@ bool AppBinding::onTaskNetworkRequest(CefRefPtr<CefBrowser> browser, CefRefPtr<C
     return true;
 }
 
-bool AppBinding::onTaskReverseData(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64 queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage)
+bool AppBinding::onTaskReverseData(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int64_t queryId, const CefString &request, bool persistent, CefRefPtr<Callback> callback, const std::string &messageName, const std::string &requestMessage)
 {
     std::string result = requestMessage.substr(messageName.size() + 1);
     std::reverse(result.begin(), result.end());

app/src/main/net/RequestClient.cpp

@@ -54,12 +54,12 @@ void RequestClient::OnRequestComplete(CefRefPtr<CefURLRequest> request)
     }
 }
 
-void RequestClient::OnUploadProgress(CefRefPtr<CefURLRequest> request, int64 current, int64 total)
+void RequestClient::OnUploadProgress(CefRefPtr<CefURLRequest> request, int64_t current, int64_t total)
 {
     uploadTotal = total;
 }
 
-void RequestClient::OnDownloadProgress(CefRefPtr<CefURLRequest> request, int64 current, int64 total)
+void RequestClient::OnDownloadProgress(CefRefPtr<CefURLRequest> request, int64_t current, int64_t total)
 {
     downloadTotal = total;
 }

modules/tasks/dmg.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 
 import modules.file as file
@@ -15,10 +14,6 @@ def run_task_build():
             "create-dmg",
             "--volname",
             config.app_name,
-            "--icon",
-            "build/{0}/{1}.app".format(config.build_type, config.app_name),
-            "--hide-extension",
-            "build/{0}/{1}.app".format(config.build_type, config.app_name),
             "--hdiutil-quiet",
             "{0}.dmg".format(config.app_name),
             "build/{0}/{1}.app".format(config.build_type, config.app_name),