Reorganise the project

intents.yml → Apps/RuuviStation/Intents/target.yml

@@ -1,9 +1,10 @@
+---
 targets: 
   station.intents:
     type: app-extension
     platform: iOS
     info:
-      path: intents/Info.plist
+      path: Info.plist
       properties:
         NSExtension: 
           NSExtensionAttributes: 
@@ -19,7 +20,7 @@ targets:
         NSHumanReadableCopyright: Copyright © 2023 Ruuvi Innovations Oy. All rights reserved.
     settings:
       base:
-        CODE_SIGN_ENTITLEMENTS: station_intents.entitlements
+        CODE_SIGN_ENTITLEMENTS: Apps/RuuviStation/Intents/Sources/Intents.entitlements
       configs:
         Alpha: 
           CODE_SIGN_IDENTITY: "iPhone Distribution"
@@ -32,10 +33,15 @@ targets:
           CODE_SIGN_IDENTITY: "iPhone Distribution"
           PROVISIONING_PROFILE_SPECIFIER: "match AdHoc com.ruuvi.station.intents"
     sources:
-    - path: intents
-    - path: ruuvi-widgets
-      excludes: 
-      - Info.plist
+      - path: Sources
+        name: Intents
+        excludes:
+        - "*.entitlements"
+        - Info.plist
+      - path: ../Widgets/Sources/
+        excludes:
+          - "*.entitlements"
+          - Info.plist
     dependencies:
       - package: Swinject
       - package: BTKit

pnservice.yml → Apps/RuuviStation/NotificationService/target.yml

@@ -1,9 +1,10 @@
+---
 targets: 
   station.pnservice:
     type: app-extension
     platform: iOS
     info:
-      path: pnservice/Info.plist
+      path: Info.plist
       properties:
         NSExtension: 
           NSExtensionPointIdentifier: com.apple.usernotifications.service
@@ -15,7 +16,7 @@ targets:
         NSHumanReadableCopyright: Copyright © 2023 Ruuvi Innovations Oy. All rights reserved.
     settings:
       base:
-        CODE_SIGN_ENTITLEMENTS: pnservice.entitlements
+        CODE_SIGN_ENTITLEMENTS: Apps/RuuviStation/NotificationService/Sources/NotificationService.entitlements
       configs:
         Alpha: 
           CODE_SIGN_IDENTITY: "iPhone Distribution"
@@ -28,7 +29,11 @@ targets:
           CODE_SIGN_IDENTITY: "iPhone Distribution"
           PROVISIONING_PROFILE_SPECIFIER: "match AdHoc com.ruuvi.station.pnservice"
     sources:
-      - path: pnservice
+      - path: Sources
+        name: NotificationService
+        excludes:
+        - "*.entitlements"
+        - Info.plist
     resources:
-      - path: station/Resources/Strings/
-      - path: station/Resources/Sounds/
+      - path: ../Sources/Resources/Strings/
+      - path: ../Sources/Resources/Sounds/

station/Classes/Application/AppAssemblyConstants.swift → Apps/RuuviStation/Sources/Classes/Application/AppAssemblyConstants.swift

@@ -1,7 +1,6 @@
 import Foundation
 
 struct Networking: Codable {
-    var OpenWeatherMapAPIKey: String
     var RuuviCloudURL: String
     var RuuviCloudURLDev: String
 }
@@ -11,7 +10,6 @@ enum AppAssemblyConstants {
     static let xml = FileManager.default.contents(atPath: networkingPath)!
     static let networkingPlist = try! PropertyListDecoder().decode(Networking.self, from: xml)
 
-    static let openWeatherMapApiKey = networkingPlist.OpenWeatherMapAPIKey
     static let ruuviCloudUrl = networkingPlist.RuuviCloudURL
     static let ruuviCloudUrlDev = networkingPlist.RuuviCloudURLDev
     static let simpleWidgetKindId = "ruuvi.simpleWidget"