From 1c9de31cf00d41ac9d63867c3c384314817ba3ec Mon Sep 17 00:00:00 2001
From: Tim Teulings <Framstag@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:49:50 +0100
Subject: [PATCH] fix: broken Visual Studio build with meson

- Update to Visual Studio 2022
- Update to newer Android NDK
---
 ...est_on_vs2019.yml => build_and test_on_vs2022.yml} |  8 ++++----
 .../workflows/build_on_ubuntu_22_04_qt_android.yml    | 11 ++++++-----
 ..._ubuntu_22_04.yml => sanitize_on_ubuntu_24_04.yml} |  0
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename .github/workflows/{build_and test_on_vs2019.yml => build_and test_on_vs2022.yml} (96%)
 rename .github/workflows/{sanitize_on_ubuntu_22_04.yml => sanitize_on_ubuntu_24_04.yml} (100%)

diff --git a/.github/workflows/build_and test_on_vs2019.yml b/.github/workflows/build_and test_on_vs2022.yml
similarity index 96%
rename from .github/workflows/build_and test_on_vs2019.yml
rename to .github/workflows/build_and test_on_vs2022.yml
index 65ef00207..022e3db80 100644
--- a/.github/workflows/build_and test_on_vs2019.yml	
+++ b/.github/workflows/build_and test_on_vs2022.yml	
@@ -1,4 +1,4 @@
-name: Visual Studio 2019
+name: Visual Studio 2022
 
 on:
   pull_request:
@@ -13,7 +13,7 @@ on:
 jobs:
   build_cmake:
     name: cmake
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
       - name: Create build directory
         run:  mkdir build
       - name: Configure build project
-        run:  cmake -G "Visual Studio 16 2019" -A x64 -DOSMSCOUT_BUILD_DOC_API=OFF -DCMAKE_SYSTEM_VERSION=10.0.18362.0 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake -Wno-dev ..
+        run:  cmake -G "Visual Studio 17 2022" -A x64 -DOSMSCOUT_BUILD_DOC_API=OFF -DCMAKE_SYSTEM_VERSION=10.0.18362.0 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake -Wno-dev ..
         working-directory: build
       - name: Build project
         run: cmake --build build
@@ -73,7 +73,7 @@ jobs:
 
   build_meson:
     name: meson
-    runs-on: windows-2019
+    runs-on: windows-2022
     defaults:
       run:
         shell: cmd
diff --git a/.github/workflows/build_on_ubuntu_22_04_qt_android.yml b/.github/workflows/build_on_ubuntu_22_04_qt_android.yml
index c2e17c9cc..600984ed1 100644
--- a/.github/workflows/build_on_ubuntu_22_04_qt_android.yml
+++ b/.github/workflows/build_on_ubuntu_22_04_qt_android.yml
@@ -1,8 +1,9 @@
-name: Ubuntu 22.04 for Qt on Android
+name: Ubuntu 24.04 for Qt on Android
 
 # See https://doc.qt.io/qt-5/android-getting-started.html
 # See https://github.com/jurplel/install-qt-action
 # See https://github.com/miurahr/aqtinstall/
+# See https://groups.google.com/g/android-ndk-announce?hl=de for released Android NDK versions
 
 on:
   pull_request:
@@ -17,7 +18,7 @@ on:
 jobs:
   build:
     name: Ubuntu+android - Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,7 +30,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          packages: "platform-tools platforms;android-34 build-tools;34.0.0 ndk;26.3.11579264"
+          packages: "platform-tools platforms;android-34 build-tools;34.0.0 ndk;27.2.12479018"
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -47,8 +48,8 @@ jobs:
         run:  ls -l ../Qt/5.15.2/android/
       - name: Configure build project
         run: "cmake -B build
-                    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_HOME}/ndk/26.3.11579264/build/cmake/android.toolchain.cmake
-                    -DANDROID_NDK=${ANDROID_HOME}/ndk/26.3.11579264/
+                    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_HOME}/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
+                    -DANDROID_NDK=${ANDROID_HOME}/ndk/27.2.12479018/
                     -DANDROID_ABI=arm64-v8a
                     -DANDROID_PLATFORM=android-34
                     -DANDROID_STL=c++_shared
diff --git a/.github/workflows/sanitize_on_ubuntu_22_04.yml b/.github/workflows/sanitize_on_ubuntu_24_04.yml
similarity index 100%
rename from .github/workflows/sanitize_on_ubuntu_22_04.yml
rename to .github/workflows/sanitize_on_ubuntu_24_04.yml