Modify project.yml for xcodegened project with Frameworks (#1717)

Migration: migrate from cocoapods. What: created project.yml and refactored code to be able to build from frameworks Steps: > brew upgrade xcodegen > xcodegen > xed Ruuvi\ Station.xcodeproj/ > Build and Run
ruuvi · Nov 23, 2023 · 93203fd · 93203fd
1 parent 236213d
commit 93203fd
Show file tree

Hide file tree

Showing 69 changed files with 1,282 additions and 242 deletions.
diff --git a/Common/RuuviLocalization/Info.plist b/Common/RuuviLocalization/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Common/RuuviLocalization/target.yml b/Common/RuuviLocalization/target.yml
@@ -0,0 +1,5 @@
+---
+targets:
+  RuuviLocalization:
+    templates:
+    - CommonFramework
diff --git a/Common/RuuviPresenters/Info.plist b/Common/RuuviPresenters/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Common/RuuviPresenters/Sources/RuuviPresenters/Util/RuuviBundleUtils.swift b/Common/RuuviPresenters/Sources/RuuviPresenters/Util/RuuviBundleUtils.swift
@@ -3,10 +3,15 @@ import UIKit
 
 extension Bundle {
     public static func pod(_ clazz: AnyClass) -> Bundle {
-        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first,
-           let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"),
-           let bundle = Bundle(url: bundleURL) {
-            return bundle
+        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first {
+            if let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"), let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else if let bundleURL = Bundle(for: clazz).resourceURL, let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else {
+                assertionFailure()
+                return Bundle.main
+            }
         } else {
             assertionFailure()
             return Bundle.main

diff --git a/Common/RuuviPresenters/target.yml b/Common/RuuviPresenters/target.yml
@@ -0,0 +1,5 @@
+---
+targets:
+  RuuviPresenters:
+    templates:
+    - CommonFramework
diff --git a/Modules/RuuviDiscover/Info.plist b/Modules/RuuviDiscover/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Util/RuuviBundleUtils.swift b/Modules/RuuviDiscover/Sources/RuuviDiscover/Util/RuuviBundleUtils.swift
@@ -3,10 +3,15 @@ import UIKit
 
 extension Bundle {
     public static func pod(_ clazz: AnyClass) -> Bundle {
-        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first,
-           let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"),
-           let bundle = Bundle(url: bundleURL) {
-            return bundle
+        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first {
+            if let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"), let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else if let bundleURL = Bundle(for: clazz).resourceURL, let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else {
+                assertionFailure()
+                return Bundle.main
+            }
         } else {
             assertionFailure()
             return Bundle.main

diff --git a/Modules/RuuviDiscover/target.yml b/Modules/RuuviDiscover/target.yml
@@ -0,0 +1,16 @@
+---
+targets:
+  RuuviDiscover:
+    templates:
+    - Module
+    dependencies:
+    - package: BTKit
+    - package: Future
+    - target: RuuviOntology
+    - target: RuuviContext
+    - target: RuuviReactor
+    - target: RuuviLocal
+    - target: RuuviService
+    - target: RuuviVirtual
+    - target: RuuviPresenters
+    - target: RuuviLocalization
diff --git a/Modules/RuuviLocationPicker/Info.plist b/Modules/RuuviLocationPicker/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Modules/RuuviLocationPicker/Sources/RuuviLocationPicker/Util/RuuviBundleUtils.swift b/Modules/RuuviLocationPicker/Sources/RuuviLocationPicker/Util/RuuviBundleUtils.swift
@@ -3,10 +3,15 @@ import UIKit
 
 extension Bundle {
     public static func pod(_ clazz: AnyClass) -> Bundle {
-        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first,
-           let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"),
-           let bundle = Bundle(url: bundleURL) {
-            return bundle
+        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first {
+            if let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"), let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else if let bundleURL = Bundle(for: clazz).resourceURL, let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else {
+                assertionFailure()
+                return Bundle.main
+            }
         } else {
             assertionFailure()
             return Bundle.main

diff --git a/Modules/RuuviLocationPicker/target.yml b/Modules/RuuviLocationPicker/target.yml
@@ -0,0 +1,12 @@
+---
+targets:
+  RuuviLocationPicker:
+    templates:
+    - Module
+    dependencies:
+    - package: Future
+    - target: RuuviOntology
+    - target: RuuviPresenters
+    - target: RuuviLocalization
+    - target: RuuviCore
+    - target: RuuviLocation
diff --git a/Modules/RuuviOnboard/Helpers/Extension.swift b/Modules/RuuviOnboard/Helpers/Extension.swift
diff --git a/Modules/RuuviOnboard/Info.plist b/Modules/RuuviOnboard/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/Util/RuuviBundleUtils.swift b/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/Util/RuuviBundleUtils.swift
@@ -3,10 +3,15 @@ import UIKit
 
 extension Bundle {
     public static func pod(_ clazz: AnyClass) -> Bundle {
-        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first,
-           let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"),
-           let bundle = Bundle(url: bundleURL) {
-            return bundle
+        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first {
+            if let bundleURL = Bundle(for: clazz).resourceURL?.appendingPathComponent("\(module).bundle"), let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else if let bundleURL = Bundle(for: clazz).resourceURL, let bundle = Bundle(url: bundleURL) {
+                return bundle
+            } else {
+                assertionFailure()
+                return Bundle.main
+            }
         } else {
             assertionFailure()
             return Bundle.main

diff --git a/Modules/RuuviOnboard/target.yml b/Modules/RuuviOnboard/target.yml
@@ -0,0 +1,7 @@
+---
+targets:
+  RuuviOnboard:
+    templates:
+    - Module
+    dependencies:
+    - target: RuuviUser
diff --git a/Packages/RuuviAnalytics/Info.plist b/Packages/RuuviAnalytics/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Packages/RuuviAnalytics/target.yml b/Packages/RuuviAnalytics/target.yml
@@ -0,0 +1,17 @@
+---
+targets:
+  RuuviAnalytics:
+    name: RuuviAnalytics
+    templates:
+    - Framework
+    dependencies:
+    - package: Humidity
+    - package: Future
+    - package: Firebase
+      product: FirebaseAnalytics
+    - target: RuuviStorage
+    - target: RuuviLocal
+    - target: RuuviOntology
+    - target: RuuviVirtual
+    - target: RuuviUser
+    - target: RuuviService
diff --git a/Packages/RuuviCloud/Info.plist b/Packages/RuuviCloud/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudFactoryPure.swift b/Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudFactoryPure.swift
@@ -2,9 +2,6 @@ import Foundation
 import RuuviPool
 import RuuviUser
 import RuuviCloud
-#if canImport(RuuviCloudApi)
-import RuuviCloudApi
-#endif
 
 public final class RuuviCloudFactoryPure: RuuviCloudFactory {
     public init() {}

diff --git a/Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudPure.swift b/Packages/RuuviCloud/Sources/RuuviCloudPure/RuuviCloudPure.swift
@@ -6,9 +6,6 @@ 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 {

diff --git a/Packages/RuuviCloud/target.yml b/Packages/RuuviCloud/target.yml
@@ -0,0 +1,12 @@
+---
+targets:
+  RuuviCloud:
+    templates:
+    - Framework
+    dependencies:
+    - package: Humidity
+    - package: BTKit
+    - package: Future
+    - target: RuuviOntology
+    - target: RuuviUser
+    - target: RuuviPool
diff --git a/Packages/RuuviContext/Info.plist b/Packages/RuuviContext/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Packages/RuuviContext/target.yml b/Packages/RuuviContext/target.yml
@@ -0,0 +1,11 @@
+---
+targets:
+  RuuviContext:
+    templates:
+    - Framework
+    dependencies:
+    - package: Realm
+    - package: Realm
+      product: RealmSwift
+    - package: GRDB
+    - target: RuuviOntology