Merge pull request #229 from Sage-Bionetworks/syoung/refactor-sharedui

Update BridgeClientKMM to use SharedMobileUI included in AssessmentModelKMM
Sage-Bionetworks · Sep 8, 2023 · 7ad66be · 7ad66be
2 parents 3099663 + 16e3d8c
commit 7ad66be
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/Sage-Bionetworks/AssessmentModelKMM.git",
         "state": {
           "branch": null,
-          "revision": "3e9991bdbe297f8be13ce95d51dd83d099ad0699",
-          "version": "0.11.0"
+          "revision": "345ff22602e119a44815889512bcc524da504300",
+          "version": "1.0.0"
         }
       },
       {
@@ -42,17 +42,8 @@
         "repositoryURL": "https://github.com/Sage-Bionetworks/MobilePassiveData-SDK.git",
         "state": {
           "branch": null,
-          "revision": "5c1b98eedde37fd6a898798c031f5e7d863404b3",
-          "version": "1.4.0"
-        }
-      },
-      {
-        "package": "SharedMobileUI",
-        "repositoryURL": "https://github.com/Sage-Bionetworks/SharedMobileUI-AppleOS.git",
-        "state": {
-          "branch": null,
-          "revision": "02192711c7f739df823bf187bd1b4cad9fe921c1",
-          "version": "0.19.0"
+          "revision": "a13ff3b41ac48d984bfbad1628c91c9752e6fd48",
+          "version": "1.5.4"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -29,18 +29,12 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(name: "SharedMobileUI",
-                 url: "https://github.com/Sage-Bionetworks/SharedMobileUI-AppleOS.git",
-                 from: "0.19.0"),
-        .package(name: "BridgeArchiver",
-                 url: "https://github.com/Sage-Bionetworks/BridgeArchiver-Swift.git",
+        .package(url: "https://github.com/Sage-Bionetworks/BridgeArchiver-Swift.git",
                  from: "0.3.0"),
-        .package(name: "JsonModel",
-                 url: "https://github.com/Sage-Bionetworks/JsonModel-Swift.git",
-                 "1.6.0"..<"3.0.0"),
-        .package(name: "AssessmentModel",
-                 url: "https://github.com/Sage-Bionetworks/AssessmentModelKMM.git",
-                 from: "0.11.0"),
+        .package(url: "https://github.com/Sage-Bionetworks/JsonModel-Swift.git",
+                 from: "2.0.0"),
+        .package(url: "https://github.com/Sage-Bionetworks/AssessmentModelKMM.git",
+                 from: "1.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -51,8 +45,8 @@ let package = Package(
         .target(name: "BridgeClientExtension",
                 dependencies: [
                     "BridgeClient",
-                    "BridgeArchiver",
-                    "JsonModel",
+                    .product(name: "BridgeArchiver", package: "BridgeArchiver-Swift"),
+                    .product(name: "JsonModel", package: "JsonModel-Swift"),
                 ],
                 path: "SwiftPackage/Sources/BridgeClientExtension"),
         .testTarget(name: "BridgeClientExtensionTests",
@@ -67,10 +61,9 @@ let package = Package(
                 dependencies: [
                     "BridgeClient",
                     "BridgeClientExtension",
-                    "SharedMobileUI",
-                    "JsonModel",
-                    .product(name: "AssessmentModel", package: "AssessmentModel"),
-                    .product(name: "AssessmentModelUI", package: "AssessmentModel"),
+                    .product(name: "JsonModel", package: "JsonModel-Swift"),
+                    .product(name: "AssessmentModel", package: "AssessmentModelKMM"),
+                    .product(name: "AssessmentModelUI", package: "AssessmentModelKMM"),
                 ],
                 path: "SwiftPackage/Sources/BridgeClientUI",
                 resources: [.process("Resources")]),