qt652

MerginMaps · Jul 25, 2023 · 9ad6155 · 9ad6155
1 parent d558cc5
commit 9ad6155
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -23,13 +23,13 @@ jobs:
     if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     env:
-      QT_VERSION: '6.5.1'
+      QT_VERSION: '6.5.2'
       NDK_VERSION: r25
       NDK_VERSION_FULL: r25b
       JDK_VERSION: 11
       SDK_PLATFORM: android-31
       SDK_BUILD_TOOLS: 33.0.1
-      INPUT_SDK_VERSION: android-macOS-20230601-154
+      INPUT_SDK_VERSION: android-macOS-20230725-157
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0

diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -11,7 +11,7 @@ jobs:
     if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-latest
     env:
-      QT_VERSION: '6.5.1'
+      QT_VERSION: '6.5.2'
     steps:
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -16,9 +16,9 @@ on:
       - published
 
 env:   
-  QT_VERSION: '6.5.1'
+  QT_VERSION: '6.5.2'
   XC_VERSION: ${{ '14.2' }}
-  INPUT_SDK_VERSION: ios-20230531-107
+  INPUT_SDK_VERSION: ios-20230725-113
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,8 +16,8 @@ on:
 
 env:
   CCACHE_DIR: ~/.ccache
-  INPUT_SDK_VERSION: ubuntu-2204-20230531-118
-  QT_VERSION: '6.5.1'
+  INPUT_SDK_VERSION: ubuntu-2204-20230725-123
+  QT_VERSION: '6.5.2'
   CACHE_VERSION: 0
 
 concurrency:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -15,8 +15,8 @@ on:
       - published
 
 env:
-  QT_VERSION: 6.5.1
-  INPUT_SDK_VERSION: mac-20230530-132
+  QT_VERSION: '6.5.2'
+  INPUT_SDK_VERSION: mac-20230725-138
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,8 +17,8 @@ on:
 
 env:
   TEST_MERGIN_URL: https://test.dev.merginmaps.com/
-  QT_VERSION: 6.5.1
-  INPUT_SDK_VERSION: mac-20230530-132
+  QT_VERSION: '6.5.2'
+  INPUT_SDK_VERSION: mac-20230725-138
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.5.1'
+      QT_VERSION: '6.5.2'
       INPUT_SDK_VERSION: win64-20230531-151
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
       CACHE_VERSION: 0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22)
 set(MM_VERSION_MAJOR "2")
 set(MM_VERSION_MINOR "3")
 set(MM_VERSION_PATCH "0")
-set(QT_VERSION_DEFAULT "6.5.1")
+set(QT_VERSION_DEFAULT "6.5.2")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for
 # Qt6AndroidMacros.cmake