Make commands for project gen and CLI build (#1723)

Implements Makefile for project generation with SPM and Frameworks

.gitignore

@@ -1,5 +1,6 @@
 # Generated
-Ruuvi Station.xcodeproj
+spm.xcodeproj
+frameworks.xcodeproj
 
 # Private 
 station/Resources/Plists/GoogleService-Info.plist

Makefile

@@ -0,0 +1,25 @@
+# generates xcodeproj for frameworks build configuration
+xcodeproj_with_frameworks:
+	xcodegen -s project_frameworks.yml
+
+# generates xcodeproj for swift package manager build configuration
+xcodeproj_with_spm:
+	xcodegen -s project_spm.yml
+
+# builds station target with frameworks build configuration for iOS
+build_with_frameworks:
+	d=$$(date +%s)\
+	; xcodebuild -project frameworks.xcodeproj -scheme station -configuration Release -sdk iphoneos17.0 build\
+    && echo "Build took $$(($$(date +%s)-d)) seconds"
+
+# builds station target with swift package manager build configuration for iOS
+build_with_spm:
+	d=$$(date +%s)\
+    ; xcodebuild -project spm.xcodeproj -scheme station -configuration Release -sdk iphoneos17.0 build\
+    && echo "Build took $$(($$(date +%s)-d)) seconds"
+
+# builds station target with development pods build configuration for iOS
+build_with_pods:
+	d=$$(date +%s)\
+	; xcodebuild -workspace station.xcworkspace -scheme station -configuration Release -sdk iphoneos17.0 build\
+	&& echo "Build took $$(($$(date +%s)-d)) seconds"

Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudFactoryPure.swift

@@ -2,7 +2,9 @@ import Foundation
 import RuuviPool
 import RuuviUser
 import RuuviCloud
-
+#if canImport(RuuviCloudApi)
+import RuuviCloudApi
+#endif
 public final class RuuviCloudFactoryPure: RuuviCloudFactory {
     public init() {}
 

Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudPure.swift

@@ -6,6 +6,9 @@ import BTKit
 import RuuviUser
 import RuuviCloud
 import RuuviPool
+#if canImport(RuuviCloudApi)
+import RuuviCloudApi
+#endif
 
 // swiftlint:disable:next type_body_length
 public final class RuuviCloudPure: RuuviCloud {

Packages/RuuviDaemon/Sources/RuuviDaemonBackground/BackgroundProcessServiceiOS13.swift

@@ -2,6 +2,9 @@ import Foundation
 import BackgroundTasks
 import Future
 import RuuviDaemon
+#if canImport(RuuviDaemonOperation)
+import RuuviDaemonOperation
+#endif
 
 @available(iOS 13, *)
 public final class BackgroundProcessServiceiOS13: BackgroundProcessService {

Packages/RuuviDaemon/Sources/RuuviDaemonBackground/BackgroundTaskServiceiOS13.swift

@@ -1,6 +1,10 @@
 import Foundation
 import BackgroundTasks
 import RuuviDaemon
+#if canImport(RuuviDaemonOperation)
+import RuuviDaemonOperation
+#endif
+
 
 @available(iOS 13, *)
 public final class BackgroundTaskServiceiOS13: BackgroundTaskService {

Packages/RuuviDaemon/Sources/RuuviDaemonVirtualTag/PullWeb/PullWebDaemonOperations.swift

@@ -1,6 +1,9 @@
 import Foundation
 import RuuviLocal
 import RuuviDaemon
+#if canImport(RuuviDaemonOperation)
+import RuuviDaemonOperation
+#endif
 
 public final class PullWebDaemonOperations: RuuviDaemonWorker, PullWebDaemon {
     private let settings: RuuviLocalSettings

Packages/RuuviService/Package.swift

@@ -92,7 +92,11 @@ let package = Package(
         .target(
             name: "RuuviServiceCloudNotification",
             dependencies: [
-                "RuuviService"
+                "RuuviService",
+                .product(
+                    name: "RuuviCloudApi",
+                    package: "RuuviCloud"
+                )
             ]
         ),
         .target(

Packages/RuuviService/Sources/RuuviServiceCloudNotification/RuuviServiceCloudNotificationImpl.swift

@@ -3,14 +3,14 @@ import Future
 import RuuviOntology
 import RuuviStorage
 import RuuviCloud
-#if canImport(RuuviCloudApi)
-import RuuviCloudApi
-#endif
 import RuuviPool
 import RuuviLocal
 import RuuviService
 import RuuviUser
 import RuuviCore
+#if canImport(RuuviCloudApi)
+import RuuviCloudApi
+#endif
 
 public final class RuuviServiceCloudNotificationImpl: RuuviServiceCloudNotification {
 

Packages/RuuviService/Sources/RuuviServiceFactory/RuuviServiceFactory.swift

@@ -7,6 +7,33 @@ import RuuviCore
 import RuuviRepository
 import RuuviService
 import RuuviUser
+#if canImport(RuuviServiceCloudSync)
+import RuuviServiceCloudSync
+#endif
+#if canImport(RuuviServiceOwnership)
+import RuuviServiceOwnership
+#endif
+#if canImport(RuuviServiceSensorProperties)
+import RuuviServiceSensorProperties
+#endif
+#if canImport(RuuviServiceSensorRecords)
+import RuuviServiceSensorRecords
+#endif
+#if canImport(RuuviServiceAppSettings)
+import RuuviServiceAppSettings
+#endif
+#if canImport(RuuviServiceOffsetCalibration)
+import RuuviServiceOffsetCalibration
+#endif
+#if canImport(RuuviServiceAlert)
+import RuuviServiceAlert
+#endif
+#if canImport(RuuviServiceAuth)
+import RuuviServiceAuth
+#endif
+#if canImport(RuuviServiceCloudNotification)
+import RuuviServiceCloudNotification
+#endif
 
 public protocol RuuviServiceFactory {
     // swiftlint:disable:next function_parameter_count

Packages/RuuviVirtual/Sources/RuuviVirtualPersistence/VirtualPersistenceRealm.swift

@@ -5,6 +5,9 @@ import RuuviOntology
 import RuuviContext
 import RuuviLocal
 import RuuviVirtual
+#if canImport(RuuviVirtualModel)
+import RuuviVirtualModel
+#endif
 
 // swiftlint:disable:next type_body_length
 public final class VirtualPersistenceRealm: VirtualPersistence {

Packages/RuuviVirtual/Sources/RuuviVirtualReactor/Combine/VirtualTagLastRecordSubjectCombine.swift

@@ -3,6 +3,9 @@ import Combine
 import RuuviContext
 import RuuviOntology
 import RealmSwift
+#if canImport(RuuviVirtualModel)
+import RuuviVirtualModel
+#endif
 
 final class VirtualTagLastRecordSubjectCombine {
     var isServing: Bool = false

Packages/RuuviVirtual/Sources/RuuviVirtualReactor/Combine/VirtualTagSubjectCombine.swift

@@ -3,6 +3,9 @@ import Combine
 import RealmSwift
 import RuuviOntology
 import RuuviContext
+#if canImport(RuuviVirtualModel)
+import RuuviVirtualModel
+#endif
 
 class VirtualTagSubjectCombine {
     var realm: RealmContext

Packages/RuuviVirtual/Sources/RuuviVirtualService/VirtualProviderServiceImpl.swift

@@ -5,6 +5,9 @@ import RuuviVirtual
 import RuuviOntology
 import RuuviLocation
 import RuuviCore
+#if canImport(RuuviVirtualOWM)
+import RuuviVirtualOWM
+#endif
 
 public final class VirtualProviderServiceImpl: VirtualProviderService {
     private let owmApi: OpenWeatherMapAPI

project.yml → project_frameworks.yml

@@ -1,4 +1,4 @@
-APP_NAME: &APP_NAME Ruuvi Station
+APP_NAME: &APP_NAME frameworks
 DEVELOPMENT_TEAM: &DEVELOPMENT_TEAM 4MUYJ4YYH4
 BUNDLE_ID_PREFIX: &BUNDLE_ID_PREFIX com.ruuvi
 
@@ -114,7 +114,7 @@ targetTemplates:
 packages:
   BTKit:
     url: https://github.com/ruuvi/BTKit
-    from: 0.4.3
+    version: 0.4.3
   Charts:
     url: https://github.com/danielgindi/Charts
     from: 4.1.0

project_spm.yml

@@ -1,4 +1,4 @@
-APP_NAME: &APP_NAME Ruuvi Station SPM
+APP_NAME: &APP_NAME spm
 DEVELOPMENT_TEAM: &DEVELOPMENT_TEAM 4MUYJ4YYH4
 BUNDLE_ID_PREFIX: &BUNDLE_ID_PREFIX com.ruuvi