Update version codes to 6.0

emericg · Jun 11, 2024 · 289e8d0 · 289e8d0
1 parent 9861dcc
commit 289e8d0
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 30 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   APP_NAME: "WatchFlower"
-  APP_VERSION: "5.5"
+  APP_VERSION: "6.0"
   QT_VERSION: "6.6.3"
 
 #-------------------------------------------------------------------------------
@@ -35,10 +35,10 @@ jobs:
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Install dependencies (from package manager)
       - name: Install dependencies (from package manager)
@@ -94,10 +94,10 @@ jobs:
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Setup env
       - name: Setup env
@@ -137,14 +137,13 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x64
-          spectre: true
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Install NSIS (already installed in 'windows-2022')
       #- name: Install NSIS

diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   APP_NAME: "WatchFlower"
-  APP_VERSION: "5.5"
+  APP_VERSION: "6.0"
   QT_VERSION: "6.6.3"
 
 #-------------------------------------------------------------------------------
@@ -51,14 +51,13 @@ jobs:
 
       # Install Qt (Android & desktop)
       - name: Install Qt (Android & desktop)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          aqtversion: '==3.1.*'
           host: 'linux'
           target: 'android'
           arch: 'android_arm64_v8a'
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
           extra: '--autodesktop'
 
       # Setup env
@@ -85,13 +84,12 @@ jobs:
 
       # Install Qt (iOS & desktop)
       - name: Install Qt (iOS & desktop)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          aqtversion: '==3.1.*'
           host: 'mac'
           target: 'ios'
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
           extra: '--autodesktop'
 
       # Setup env

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(WatchFlower VERSION 5.5 LANGUAGES CXX)
+project(WatchFlower VERSION 6.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/WatchFlower.pro b/WatchFlower.pro
@@ -1,6 +1,6 @@
 TARGET  = WatchFlower
 
-VERSION = 5.5
+VERSION = 6.0
 DEFINES+= APP_NAME=\\\"$$TARGET\\\"
 DEFINES+= APP_VERSION=\\\"$$VERSION\\\"
 

diff --git a/assets/android/AndroidManifest.xml b/assets/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
-          package="com.emeric.watchflower" android:versionName="5.5" android:versionCode="05050001">
+          package="com.emeric.watchflower" android:versionName="6.0" android:versionCode="06000001">
 
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" />
 

diff --git a/assets/android/build.gradle b/assets/android/build.gradle
@@ -88,7 +88,7 @@ android {
         ndk.abiFilters = qtTargetAbiList.split(",")
 
         namespace 'com.emeric.watchflower'
-        versionName "5.5"
+        versionName "6.0"
         versionCode timestampInt
         manifestPlaceholders = [versionName: versionName, versionCode: versionCode]
     }

diff --git a/assets/ios/Info.plist b/assets/ios/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.5</string>
+	<string>6.0</string>
 	<key>CFBundleSignature</key>
 	<string>${QMAKE_PKGINFO_TYPEINFO}</string>
 	<key>CFBundleVersion</key>
-	<string>0505001</string>
+	<string>0600001</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>

diff --git a/assets/linux/watchflower.appdata.xml b/assets/linux/watchflower.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018 Emeric Grange <[email protected]> -->
+<!-- Copyright 2024 Emeric Grange <[email protected]> -->
 
 <component type="desktop-application">
   <id>io.emeric.watchflower</id>
@@ -28,7 +28,7 @@
   </description>
 
   <releases>
-    <release version="5.5" date="2024-04-11"> <url type="details">https://github.com/emericg/WatchFlower/releases/tag/v5.5</url> </release>
+    <release version="6.0" date="2024-06-30"> <url type="details">https://github.com/emericg/WatchFlower/releases/tag/v6.0</url> </release>
     <release version="5.4" date="2024-01-17" />
     <release version="5.3" date="2023-10-03" />
     <release version="5.2" date="2023-06-30" />

diff --git a/assets/macos/Info.plist b/assets/macos/Info.plist
@@ -13,11 +13,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.5</string>
+	<string>6.0</string>
 	<key>CFBundleSignature</key>
 	<string>${QMAKE_PKGINFO_TYPEINFO}</string>
 	<key>CFBundleVersion</key>
-	<string>0505001</string>
+	<string>0600001</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/assets/windows/setup.nsi b/assets/windows/setup.nsi
@@ -9,8 +9,8 @@ Unicode True
 !define EXECNAME                     "WatchFlower"
 !define COMPANYNAME                  "Emeric Grange"
 !define DESCRIPTION                  "A plant monitoring application that reads and plots data from compatible Bluetooth sensors and thermometers like Xiaomi 'Flower Care' or Parrot 'Flower Power'"
-!define VERSIONMAJOR                 5
-!define VERSIONMINOR                 5
+!define VERSIONMAJOR                 6
+!define VERSIONMINOR                 0
 !define VERSIONBUILD                 0
 !define INSTALL_DIR_DEFAULT          "$PROGRAMFILES64\${APPNAME}"
 !define MUI_ABORTWARNING

diff --git a/deploy_linux.sh b/deploy_linux.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WatchFlower"
-export APP_VERSION=5.5
+export APP_VERSION=6.0
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Linux x86_64) [v$APP_VERSION]"

diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WatchFlower"
-export APP_VERSION=5.5
+export APP_VERSION=6.0
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (macOS x86_64) [v$APP_VERSION]"

diff --git a/deploy_windows.sh b/deploy_windows.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WatchFlower"
-export APP_VERSION=5.5
+export APP_VERSION=6.0
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Windows x86_64) [v$APP_VERSION]"