Update Dependencies & Modularization (#3)

StanfordSpezi · Apr 12, 2023 · 36c9425 · 36c9425
1 parent 8dca267
commit 36c9425
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 153 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 
 //
 // This source file is part of the CardinalKit open-source project
@@ -22,8 +22,9 @@ let package = Package(
         .library(name: "CardinalKitFHIRMockDataStorageProvider", targets: ["CardinalKitFHIRMockDataStorageProvider"])
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.4.0")),
-        .package(url: "https://github.com/StanfordBDHG/CardinalKit", .upToNextMinor(from: "0.3.3"))
+        .package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.5.0")),
+        .package(url: "https://github.com/StanfordBDHG/CardinalKit", .upToNextMinor(from: "0.4.0")),
+        .package(url: "https://github.com/StanfordBDHG/CardinalKitViews", .upToNextMinor(from: "0.2.0"))
     ],
     targets: [
         .target(
@@ -44,7 +45,7 @@ let package = Package(
             dependencies: [
                 .target(name: "CardinalKitFHIR"),
                 .product(name: "CardinalKit", package: "CardinalKit"),
-                .product(name: "Views", package: "CardinalKit")
+                .product(name: "CardinalKitViews", package: "CardinalKitViews")
             ],
             resources: [
                 .process("Resources")

diff --git a/Sources/CardinalKitFHIRMockDataStorageProvider/MockUploadDetailView.swift b/Sources/CardinalKitFHIRMockDataStorageProvider/MockUploadDetailView.swift
@@ -6,8 +6,8 @@
 // SPDX-License-Identifier: MIT
 //
 
+import CardinalKitViews
 import SwiftUI
-import Views
 
 
 struct MockUploadDetailView: View {

diff --git a/Tests/CardinalKitFHIRTests/FHIRTests.swift b/Tests/CardinalKitFHIRTests/FHIRTests.swift
@@ -131,7 +131,7 @@ final class DataStorageProviderTests: XCTestCase {
             }
         )
 
-        wait(for: [expectation], timeout: 1)
+        await fulfillment(of: [expectation], timeout: 1)
         XCTAssertEqual(count, 4)
     }
 

diff --git a/Tests/UITests/UITests.xcodeproj/project.pbxproj b/Tests/UITests/UITests.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		2F6D139A28F5F386007C25D6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2F6D139928F5F386007C25D6 /* Assets.xcassets */; };
 		2F746D9F29962B2A00BF54FE /* XCTestExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 2F746D9E29962B2A00BF54FE /* XCTestExtensions */; };
 		2FA7382C290ADFAA007ACEB9 /* TestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA7382B290ADFAA007ACEB9 /* TestApp.swift */; };
-		2FCF659129B5C9CF0041B496 /* Views in Frameworks */ = {isa = PBXBuildFile; productRef = 2FCF659029B5C9CF0041B496 /* Views */; };
 		2FCF659829B5CA630041B496 /* XCTHealthKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2FCF659729B5CA630041B496 /* XCTHealthKit */; };
 		2FD021D6299E0E0B00E5B91B /* CardinalKitFHIR in Frameworks */ = {isa = PBXBuildFile; productRef = 2FD021D5299E0E0B00E5B91B /* CardinalKitFHIR */; };
 		2FD021D8299E0E0B00E5B91B /* CardinalKitFHIRMockDataStorageProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 2FD021D7299E0E0B00E5B91B /* CardinalKitFHIRMockDataStorageProvider */; };
@@ -51,7 +50,6 @@
 				2FD021DB299E0E2F00E5B91B /* CardinalKit in Frameworks */,
 				2FD021D6299E0E0B00E5B91B /* CardinalKitFHIR in Frameworks */,
 				2FD021D8299E0E0B00E5B91B /* CardinalKitFHIRMockDataStorageProvider in Frameworks */,
-				2FCF659129B5C9CF0041B496 /* Views in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -143,7 +141,6 @@
 				2FD021D5299E0E0B00E5B91B /* CardinalKitFHIR */,
 				2FD021D7299E0E0B00E5B91B /* CardinalKitFHIRMockDataStorageProvider */,
 				2FD021DA299E0E2F00E5B91B /* CardinalKit */,
-				2FCF659029B5C9CF0041B496 /* Views */,
 			);
 			productName = Example;
 			productReference = 2F6D139228F5F384007C25D6 /* TestApp.app */;
@@ -526,7 +523,7 @@
 			repositoryURL = "https://github.com/StanfordBDHG/XCTestExtensions";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.3.0;
+				minimumVersion = 0.4.0;
 			};
 		};
 		2FCF659429B5CA400041B496 /* XCRemoteSwiftPackageReference "XCTHealthKit" */ = {
@@ -542,7 +539,7 @@
 			repositoryURL = "https://github.com/StanfordBDHG/CardinalKit.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.3.3;
+				minimumVersion = 0.4.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -553,11 +550,6 @@
 			package = 2F746D9D29962B2A00BF54FE /* XCRemoteSwiftPackageReference "XCTestExtensions" */;
 			productName = XCTestExtensions;
 		};
-		2FCF659029B5C9CF0041B496 /* Views */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 2FD021D9299E0E2F00E5B91B /* XCRemoteSwiftPackageReference "CardinalKit" */;
-			productName = Views;
-		};
 		2FCF659729B5CA630041B496 /* XCTHealthKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 2FCF659429B5CA400041B496 /* XCRemoteSwiftPackageReference "XCTHealthKit" */;

diff --git a/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,165 +1,39 @@
 {
   "pins" : [
-    {
-      "identity" : "abseil-cpp-swiftpm",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
-      "state" : {
-        "revision" : "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
-        "version" : "0.20220203.2"
-      }
-    },
-    {
-      "identity" : "boringssl-swiftpm",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
-      "state" : {
-        "revision" : "dd3eda2b05a3f459fc3073695ad1b28659066eab",
-        "version" : "0.9.1"
-      }
-    },
     {
       "identity" : "cardinalkit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordBDHG/CardinalKit",
       "state" : {
-        "revision" : "6e90348e30709f4b739fc3473c2fa54fbcf77eec",
-        "version" : "0.3.3"
-      }
-    },
-    {
-      "identity" : "fhirmodels",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/FHIRModels",
-      "state" : {
-        "revision" : "e115442fb3c5d44ffb1dc9b4e039b77fd143ad96",
+        "revision" : "4c4284f8ef44cd6346248ae44b88ce3c4c1f0a88",
         "version" : "0.4.0"
       }
     },
     {
-      "identity" : "firebase-ios-sdk",
+      "identity" : "cardinalkitviews",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "location" : "https://github.com/StanfordBDHG/CardinalKitViews",
       "state" : {
-        "revision" : "f567ed9a2b30e29159df258049a9c662c517688e",
-        "version" : "10.5.0"
+        "revision" : "7d8162f0396176faa0768e7b10b7931ef2203055",
+        "version" : "0.2.0"
       }
     },
     {
-      "identity" : "googleappmeasurement",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleAppMeasurement.git",
-      "state" : {
-        "revision" : "9a09ece724128e8d1e14c5133b87c0e236844ac0",
-        "version" : "10.4.0"
-      }
-    },
-    {
-      "identity" : "googledatatransport",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleDataTransport.git",
-      "state" : {
-        "revision" : "f6b558e3f801f2cac336b04f615ce111fa9ddaa0",
-        "version" : "9.2.1"
-      }
-    },
-    {
-      "identity" : "googleutilities",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleUtilities.git",
-      "state" : {
-        "revision" : "0543562f85620b5b7c510c6bcbef75b562a5127b",
-        "version" : "7.11.0"
-      }
-    },
-    {
-      "identity" : "grpc-ios",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/grpc/grpc-ios.git",
-      "state" : {
-        "revision" : "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
-        "version" : "1.44.3-grpc"
-      }
-    },
-    {
-      "identity" : "gtm-session-fetcher",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/gtm-session-fetcher.git",
-      "state" : {
-        "revision" : "96d7cc73a71ce950723aa3c50ce4fb275ae180b8",
-        "version" : "3.1.0"
-      }
-    },
-    {
-      "identity" : "healthkitonfhir",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/StanfordBDHG/HealthKitOnFHIR",
-      "state" : {
-        "revision" : "1b7b7d71c30563f84d4c892421caf7f1c79ff09e",
-        "version" : "0.2.2"
-      }
-    },
-    {
-      "identity" : "leveldb",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/leveldb.git",
-      "state" : {
-        "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
-        "version" : "1.22.2"
-      }
-    },
-    {
-      "identity" : "nanopb",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/nanopb.git",
-      "state" : {
-        "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
-        "version" : "2.30909.0"
-      }
-    },
-    {
-      "identity" : "promises",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/promises.git",
-      "state" : {
-        "revision" : "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
-        "version" : "2.2.0"
-      }
-    },
-    {
-      "identity" : "researchkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/StanfordBDHG/ResearchKit",
-      "state" : {
-        "revision" : "52a9bd8bcf2112b2f70479cd192f8c5fa9850c31",
-        "version" : "2.2.8"
-      }
-    },
-    {
-      "identity" : "researchkitonfhir",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/StanfordBDHG/ResearchKitOnFHIR",
-      "state" : {
-        "revision" : "1bc7a15760916ade4c5058fa798a871e80c2955c",
-        "version" : "0.1.6"
-      }
-    },
-    {
-      "identity" : "swift-protobuf",
+      "identity" : "fhirmodels",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
+      "location" : "https://github.com/apple/FHIRModels",
       "state" : {
-        "revision" : "ab3a58b7209a17d781c0d1dbb3e1ff3da306bae8",
-        "version" : "1.20.3"
+        "revision" : "861afd5816a98d38f86220eab2f812d76cad84a0",
+        "version" : "0.5.0"
       }
     },
     {
       "identity" : "xctestextensions",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordBDHG/XCTestExtensions",
       "state" : {
-        "revision" : "a96a1680557507a9746bbb0529043b9767c503db",
-        "version" : "0.3.0"
+        "revision" : "3037f2e8ad1cd2e08a0dfbe5f0a4866445102150",
+        "version" : "0.4.0"
       }
     },
     {
@@ -170,6 +44,15 @@
         "revision" : "19395bbd14a2554e4c9d3fe5cf38aa626c807269",
         "version" : "0.3.3"
       }
+    },
+    {
+      "identity" : "xctruntimeassertions",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/StanfordBDHG/XCTRuntimeAssertions",
+      "state" : {
+        "revision" : "585ec9d1caa29bacc0d82eb70d4287401dfa452b",
+        "version" : "0.2.0"
+      }
     }
   ],
   "version" : 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,7 @@ final class DataStorageProviderTests: XCTestCase { @@
                 }
             )
-            wait(for: [expectation], timeout: 1)
+            await fulfillment(of: [expectation], timeout: 1)
             XCTAssertEqual(count, 4)
         }
@@ Expand Down @@