Merge pull request #4 from paulocoutinhox/update-version

update version

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem.
 **System (please complete the following information):**
  - OS: [e.g. Ubuntu]
  - Version [e.g. 18.04]
- - CMake [e.g. 3.20]
+ - CMake [e.g. 3.24]
  - Compiler [e.g. clang 12]
 
 **Additional context**

.github/workflows/linux-arm.yml

@@ -1,6 +1,11 @@
 name: Linux ARM
 
-on: [push]
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'extras/images/**'
 
 jobs:
   build:

.github/workflows/linux.yml

@@ -1,6 +1,11 @@
 name: Linux
 
-on: [push]
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'extras/images/**'
 
 jobs:
   build:
@@ -42,7 +47,7 @@ jobs:
       - name: Install CMake
         uses: jwlawson/actions-setup-cmake@v1.8
         with:
-          cmake-version: "3.20.0"
+          cmake-version: "3.24.0"
 
       - name: Build
         run: |

.github/workflows/macos.yml

@@ -1,6 +1,11 @@
 name: macOS
 
-on: [push]
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'extras/images/**'
 
 jobs:
   build:
@@ -50,7 +55,7 @@ jobs:
       - name: Install CMake
         uses: jwlawson/actions-setup-cmake@v1.8
         with:
-          cmake-version: "3.20.0"
+          cmake-version: "3.24.0"
 
       - name: Build
         run: |

.github/workflows/windows.yml

@@ -1,6 +1,11 @@
 name: Windows
 
-on: [push]
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'extras/images/**'
 
 jobs:
   build:
@@ -63,7 +68,7 @@ jobs:
       - name: Install CMake
         uses: jwlawson/actions-setup-cmake@v1.8
         with:
-          cmake-version: "3.20.0"
+          cmake-version: "3.24.0"
 
       - name: Build
         run: |

CMakeLists.txt

@@ -9,7 +9,7 @@ project("MyApp")
 
 # CEF configuration
 set_property(GLOBAL PROPERTY OS_FOLDERS ON)
-set(CEF_VERSION "103.0.12+g8eb56c7+chromium-103.0.5060.134")
+set(CEF_VERSION "111.2.7+gebf5d6a+chromium-111.0.5563.148")
 
 # Determine the platform
 if(NOT DEFINED CEF_PLATFORM)

README.md

@@ -16,7 +16,7 @@ CEF is Chromium Embedded Framework (https://bitbucket.org/chromiumembedded/) and
 ## Screenshots
 
 <p align="center">
-    <img src="extras/screenshots/app.png?rnd=2021-06-29" alt="screenshot" style="max-width: 400px">
+    <img src="extras/images/app.png?rnd=2021-06-29" alt="screenshot" style="max-width: 400px">
 </p>
 
 ## Download
@@ -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: `94.4.1+g4b61a8c+chromium-94.0.4606.54`.
+Example of valid version: `111.2.7+gebf5d6a+chromium-111.0.5563.148`.
 
 Visit https://cef-builds.spotifycdn.com/index.html for the list of supported platforms and versions.
 

app/cmake/cef/DownloadCEF.cmake

@@ -1,44 +1,44 @@
-# Download the CEF binary distribution for |platform| and |version| to |download_dir|.
-# The |CEF_ROOT| variable will be set in global scope pointing to the extracted location.
-# Visit https://cef-builds.spotifycdn.com/index.html for the list of supported platforms and versions.
-function(DownloadCEF platform version download_dir)
-  # specify the binary distribution type and download directory
-  set(CEF_DISTRIBUTION "cef_binary_${version}_${platform}")
-  set(CEF_DOWNLOAD_DIR "${download_dir}")
-
-  # the location where we expect the extracted binary distribution
-  set(CEF_ROOT "${CEF_DOWNLOAD_DIR}/${CEF_DISTRIBUTION}" CACHE INTERNAL "CEF_ROOT")
-
-  # download and/or extract the binary distribution if necessary
-  if(NOT IS_DIRECTORY "${CEF_ROOT}")
-    set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2")
-    set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}")
-
-    if(NOT EXISTS "${CEF_DOWNLOAD_PATH}")
-      set(CEF_DOWNLOAD_URL "https://cef-builds.spotifycdn.com/${CEF_DOWNLOAD_FILENAME}")
-      string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL_ESCAPED ${CEF_DOWNLOAD_URL})
-
-      # download the SHA1 hash for the binary distribution
-      message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...")
-
-      file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1")
-      file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1)
-
-      # download the binary distribution and verify the hash
-      message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}...")
-
-      file(
-        DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}" "${CEF_DOWNLOAD_PATH}"
-        EXPECTED_HASH SHA1=${CEF_SHA1}
-        SHOW_PROGRESS
-        )
-    endif()
-
-    # extract the binary distribution
-    message(STATUS "Extracting ${CEF_DOWNLOAD_PATH}...")
-    execute_process(
-      COMMAND ${CMAKE_COMMAND} -E tar xzf "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}"
-      WORKING_DIRECTORY ${CEF_DOWNLOAD_DIR}
-      )
-  endif()
-endfunction()
+# Download the CEF binary distribution for |platform| and |version| to |download_dir|.
+# The |CEF_ROOT| variable will be set in global scope pointing to the extracted location.
+# Visit https://cef-builds.spotifycdn.com/index.html for the list of supported platforms and versions.
+function(DownloadCEF platform version download_dir)
+  # specify the binary distribution type and download directory
+  set(CEF_DISTRIBUTION "cef_binary_${version}_${platform}")
+  set(CEF_DOWNLOAD_DIR "${download_dir}")
+
+  # the location where we expect the extracted binary distribution
+  set(CEF_ROOT "${CEF_DOWNLOAD_DIR}/${CEF_DISTRIBUTION}" CACHE INTERNAL "CEF_ROOT")
+
+  # download and/or extract the binary distribution if necessary
+  if(NOT IS_DIRECTORY "${CEF_ROOT}")
+    set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2")
+    set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}")
+
+    if(NOT EXISTS "${CEF_DOWNLOAD_PATH}")
+      set(CEF_DOWNLOAD_URL "https://cef-builds.spotifycdn.com/${CEF_DOWNLOAD_FILENAME}")
+      string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL_ESCAPED ${CEF_DOWNLOAD_URL})
+
+      # download the SHA1 hash for the binary distribution
+      message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...")
+
+      file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1")
+      file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1)
+
+      # download the binary distribution and verify the hash
+      message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}...")
+
+      file(
+        DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}" "${CEF_DOWNLOAD_PATH}"
+        EXPECTED_HASH SHA1=${CEF_SHA1}
+        SHOW_PROGRESS
+      )
+    endif()
+
+    # extract the binary distribution
+    message(STATUS "Extracting ${CEF_DOWNLOAD_PATH}...")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E tar xzf "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}"
+      WORKING_DIRECTORY ${CEF_DOWNLOAD_DIR}
+    )
+  endif()
+endfunction()

app/resources/macos/Info.plist

@@ -28,7 +28,7 @@
 		<string>0</string>
 	</dict>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.10.0</string>
+	<string>10.13</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

app/resources/macos/helper-Info.plist

@@ -28,7 +28,7 @@
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.10.0</string>
+	<string>10.13</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>

app/src/shared/windows/Entrypoint.cpp

@@ -17,8 +17,10 @@ namespace shared
 // entry point function for all processes
 int APIENTRY wWinMain(HINSTANCE hInstance)
 {
-    // enable High-DPI support on Windows 7 or newer
+// enable High-DPI support on Windows 7 or newer on version less than 112
+#if CEF_VERSION_MAJOR < 112
     CefEnableHighDPISupport();
+#endif
 
     void *sandboxInfo = nullptr;