Work on CI builds

emericg · Aug 8, 2024 · 8454ec8 · 8454ec8
1 parent 6861030
commit 8454ec8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -38,7 +38,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts
+          modules: qtconnectivity qtcharts qtpositioning
 
       # Install dependencies (from package manager)
       - name: Install dependencies (from package manager)
@@ -97,7 +97,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts
+          modules: qtconnectivity qtcharts qtpositioning
 
       # Setup env
       - name: Setup env
@@ -143,7 +143,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts
+          modules: qtconnectivity qtcharts qtpositioning
 
       # Install NSIS (already installed in 'windows-2022')
       #- name: Install NSIS

diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml
@@ -46,7 +46,7 @@ jobs:
       #- name: Install Android SDK / NDK / tools
       #  run: |
       #       sdkmanager "platforms;android-34"
-      #       sdkmanager "ndk;25.2.9519653"
+      #       sdkmanager "ndk;26.3.11579264"
       #       sdkmanager "build-tools;34.0.0"
 
       # Install Qt (Android & desktop)
@@ -57,7 +57,7 @@ jobs:
           host: 'linux'
           target: 'android'
           arch: 'android_arm64_v8a'
-          modules: qtconnectivity qtcharts
+          modules: qtconnectivity qtcharts qtpositioning
           extra: '--autodesktop'
 
       # Setup env
@@ -89,7 +89,7 @@ jobs:
           version: ${{env.QT_VERSION}}
           host: 'mac'
           target: 'ios'
-          modules: qtconnectivity qtcharts
+          modules: qtconnectivity qtcharts qtpositioning
           extra: '--autodesktop'
 
       # Setup env

diff --git a/assets/android/build.gradle b/assets/android/build.gradle
@@ -84,7 +84,7 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion 23 // qtMinSdkVersion
-        targetSdkVersion 34 // qtTargetSdkVersion
+        targetSdkVersion 35 // qtTargetSdkVersion
         ndk.abiFilters = qtTargetAbiList.split(",")
 
         namespace 'com.emeric.watchflower'

diff --git a/assets/android/gradle.properties b/assets/android/gradle.properties
@@ -21,7 +21,7 @@ android.useAndroidX=true
 
 androidCompileSdkVersion=34
 androidBuildToolsVersion=34.0.0
-androidNdkVersion=26.1.10909125
+androidNdkVersion=26.3.11579264
 
 qtMinSdkVersion=23
-qtTargetSdkVersion=34
+qtTargetSdkVersion=35