2.6.0 Public Beta

.github/workflows/firebase.yml

@@ -1,17 +1,21 @@
-name: Upload to Firebase
+name: Deploy to Firebase [Ruuvi Station]
 
 on:
   pull_request:
     types:
       - closed
-    branches: [ alpha ]
+    branches: [alpha]
 
 jobs:
   build:
     if: github.event.pull_request.merged == true
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15'
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -26,17 +30,6 @@ jobs:
       - name: Clone localisation submodule
         run: git clone -b dev https://github.com/ruuvi/station.localization.git ${{ github.workspace }}/station.localization
 
-      - name: Cocoapods Cache
-        uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-
-      - name: CocoaPods Install
-        run: pod install
-
       - name: Install the Apple certificate and provisioning profiles
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -61,10 +54,33 @@ jobs:
           echo -n "${{ secrets.INTENTS_APP_ADHOC_PROVISION_PROFILE_BASE64 }}" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/match_AdHoc_com.ruuvi.station.intents.mobileprovision
           echo -n "${{ secrets.PNSERVICE_APP_ADHOC_PROVISION_PROFILE_BASE64 }}" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/match_AdHoc_com.ruuvi.station.pnservice.mobileprovision
 
+      - name: Increment build number
+        run: |
+          make set_build_number
+
+      - name: Tools cache
+        uses: actions/cache@v2
+        with:
+          path: .tools/
+          key: ${{ runner.os }}-tools-${{ hashFiles('/.tools/') }}
+          restore-keys: |
+            ${{ runner.os }}-tools-
+
+      - name: Make xcodeproj
+        run: |
+          make xcodeproj
+
+      - name: SPM Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/Ruuvi*/SourcePackages/
+          key: ${{ runner.os }}-Ruuvi-${{ hashFiles('Ruuvi.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-Ruuvi-
+
       - name: Build app
         run: |
-          xcodebuild -workspace station.xcworkspace -scheme station_dev -configuration Debug -archivePath ./Build/Station_Dev.xcarchive archive -allowProvisioningUpdates
-
+          xcodebuild -project Ruuvi.xcodeproj -scheme station -configuration Alpha -archivePath ./Build/Station_Dev.xcarchive archive -allowProvisioningUpdates -quiet
       - name: Export IPA
         env:
           EXPORT_PLIST: ${{ secrets.ADHOC_EXPORT_OPTIONS }}
@@ -73,14 +89,21 @@ jobs:
           echo -n "$EXPORT_PLIST" | base64 --decode > $EXPORT_PLIST_PATH
           xcodebuild -exportArchive -archivePath ./Build/Station_Dev.xcarchive -exportOptionsPlist $EXPORT_PLIST_PATH -exportPath ${{ runner.temp }}/export
 
+      - name: Build Changelog
+        id: build_changelog
+        uses: mikepenz/[email protected]
+
+      - name: Install firebase CLI
+        run: |
+          make installed_firebase
+
       - name: Distribute to Firebase
         run: |
-          curl -sL https://firebase.tools | bash
-          firebase appdistribution:distribute ${{ runner.temp }}/export/*.ipa \
+          .tools/firebase/firebase appdistribution:distribute ${{ runner.temp }}/export/*.ipa \
             --app ${{ secrets.GOOGLE_APP_ID }} \
             --token ${{ secrets.FIREBASE_REFRESH_TOKEN }} \
             --groups ${{ secrets.ALPHA_TESTERS_GROUP }} \
-            --release-notes "Features, enhancements and bug fixes." 
+            --release-notes "${{ steps.build_changelog.outputs.changelog }}"
 
       - name: Zip dSYM files
         run: |
@@ -89,7 +112,7 @@ jobs:
       - name: Upload dSYM to Firebase
         run: |
           find ${{ runner.temp }}/export -name '*.dSYM.zip' | xargs -I \{\} firebase crashlytics:upload-symbols --app ${{ secrets.GOOGLE_APP_ID }} -g \{\}
-      
+
       - name: Clean up keychain and provisioning profiles
         if: ${{ always() }}
         run: |

.github/workflows/pr_checks.yml

@@ -0,0 +1,16 @@
+name: Checks for opened PR
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  swiftlint:
+    runs-on: ubuntu-latest
+    name: SwiftLint
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Lint
+        uses: norio-nomura/[email protected]

.github/workflows/testflight.yml

@@ -4,14 +4,18 @@ on:
   pull_request:
     types:
       - closed
-    branches: [ testflight ]
+    branches: [testflight]
 
 jobs:
   build:
     if: github.event.pull_request.merged == true
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15'
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -24,18 +28,7 @@ jobs:
         run: rm -rf ${{ github.workspace }}/station.localization
 
       - name: Clone localisation submodule
-        run: git clone -b dev https://github.com/ruuvi/station.localization.git ${{ github.workspace }}/station.localization
-
-      - name: Cocoapods Cache
-        uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-
-      - name: CocoaPods Install
-        run: pod install
+        run: git clone -b master https://github.com/ruuvi/station.localization.git ${{ github.workspace }}/station.localization
 
       - name: Install the Apple certificate and provisioning profiles
         env:
@@ -66,10 +59,34 @@ jobs:
           echo -n "${{ secrets.INTENTS_APP_APPSTORE_PROVISION_PROFILE_BASE64 }}" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/match__AppStore_com.ruuvi.station.intents.mobileprovision
           echo -n "${{ secrets.PNSERVICE_APP_APPSTORE_PROVISION_PROFILE_BASE64 }}" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/match_AppStore_com.ruuvi.station.pnservice.mobileprovision
 
+      - name: Increment build number
+        run: |
+          make set_build_number
+
+      - name: Tools cache
+        uses: actions/cache@v2
+        with:
+          path: .tools/
+          key: ${{ runner.os }}-tools-${{ hashFiles('/.tools/') }}
+          restore-keys: |
+            ${{ runner.os }}-tools-
+
+      - name: Make xcodeproj
+        run: |
+          make xcodeproj
+
+      - name: SPM Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/Ruuvi*/SourcePackages/
+          key: ${{ runner.os }}-Ruuvi-${{ hashFiles('Ruuvi.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-Ruuvi-
+
       - name: Build app
         run: |
-          xcodebuild -workspace station.xcworkspace -scheme station -configuration Release -archivePath ./Build/Station.xcarchive archive -allowProvisioningUpdates
-      
+          xcodebuild -project Ruuvi.xcodeproj -scheme station -configuration Release -archivePath ./Build/Station.xcarchive archive -allowProvisioningUpdates -quiet
+
       - name: Export IPA
         env:
           EXPORT_PLIST: ${{ secrets.APPSTORE_EXPORT_OPTIONS }}

.gitignore

@@ -1,3 +1,10 @@
+# Tools
+.tools
+
+# Generated
+Ruuvi.xcodeproj
+**/Info.plist
+
 # Private 
 station/Resources/Plists/GoogleService-Info.plist
 station/Classes/Networking/Assembly/Networking.plist
@@ -7,7 +14,6 @@ station/Classes/Networking/Assembly/Networking.plist
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
 ## Build generated
-build/
 DerivedData/
 
 ## Various settings

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "station.localization"]
 	path = station.localization
 	url = [email protected]:ruuvi/station.localization.git
-[submodule "Templates/swifty_vm_viper"]
-	path = Templates/swifty_vm_viper
-	url = [email protected]:viikufa/swifty_vm_viper.git

.swiftformat

@@ -0,0 +1,4 @@
+--swiftversion 5.9
+--disable wrapMultilineStatementBraces,trailingCommas
+--xcodeindentation enabled
+--wraparguments before-first

.swiftgen.assets.yml

@@ -0,0 +1,27 @@
+strings:
+  - inputs: ./Common/RuuviLocalization/Sources/Resources/en.lproj/Localizable.strings
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/strings-swift5.stencil
+        output: ./Common/RuuviLocalization/Sources/RuuviLocalization.swift
+        params:
+          forceProvidesNamespaces: true 
+          publicAccess: true             
+          enumName: RuuviLocalization
+
+xcassets:
+  - inputs: ./Common/RuuviLocalization/Sources/Resources/RuuviAssets.xcassets
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/xcassets-swift5.stencil
+        output: ./Common/RuuviLocalization/Sources/RuuviAsset.swift
+        params:
+          forceProvidesNamespaces: true 
+          publicAccess: true             
+          enumName: RuuviAsset
+  - inputs: ./Common/RuuviLocalization/Sources/Resources/RuuviColors.xcassets
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/xcassets-swift5.stencil
+        output: ./Common/RuuviLocalization/Sources/RuuviColor.swift
+        params:
+          forceProvidesNamespaces: true 
+          publicAccess: true             
+          enumName: RuuviColor

.swiftgen.localizable.yml

@@ -0,0 +1,25 @@
+json:
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_en.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/en.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_sv.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/sv.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_ru.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/ru.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_fi.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/fi.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_fr.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/fr.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_de.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/de.lproj/Localizable.strings

.swiftlint.yml

@@ -1,13 +1,14 @@
+trailing_comma:
+  mandatory_comma: true
+opening_brace:
+  allow_multiline_func: true
 nesting:
   type_level: 3
-excluded: # paths to ignore during linting. Takes precedence over `included`.
+excluded:
   - Carthage
   - Pods
-  - stationTests
-  - Package
-  - station/ThirdParty
-disabled_rules: # rule identifiers to exclude from running
+disabled_rules:
+  - closure_parameter_position
   - identifier_name
   - force_try
-  - closure_parameter_position
   - todo

Apps/RuuviStation/Intents/Sources/IntentHandler.swift

@@ -0,0 +1,22 @@
+import Intents
+
+class IntentHandler: INExtension, RuuviTagSelectionIntentHandling {
+    private let viewModel = WidgetViewModel()
+    func provideRuuviWidgetTagOptionsCollection(
+        for _: RuuviTagSelectionIntent,
+        with completion: @escaping (
+            INObjectCollection<RuuviWidgetTag>?,
+            Error?
+        ) -> Void
+    ) {
+        viewModel.fetchRuuviTags(completion: { response in
+            let newValues = response.compactMap { sensor in
+                RuuviWidgetTag(identifier: sensor.sensor.id, display: sensor.sensor.name)
+            }.sorted(by: { first, second in
+                first.displayString.lowercased() < second.displayString.lowercased()
+            })
+            let items = INObjectCollection(items: newValues)
+            completion(items, nil)
+        })
+    }
+}