Move from local SPM to GitHub

FreeAPS.xcodeproj/project.pbxproj

@@ -235,7 +235,7 @@
 		38FEF413273B317A00574A46 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38FEF412273B317A00574A46 /* HKUnit.swift */; };
 		3B5CD1EC2D4912A600CE213C /* OpenAPSSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5CD1E92D4912A600CE213C /* OpenAPSSwift.swift */; };
 		3B5CD1ED2D4912A600CE213C /* JSONBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5CD1EA2D4912A600CE213C /* JSONBridge.swift */; };
-		3B5CD1EF2D4915BF00CE213C /* OpenAPSKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3B5CD1EE2D4915BF00CE213C /* OpenAPSKit */; };
+		3B5CD2762D4A74FF00CE213C /* OpenAPSKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3B5CD2752D4A74FF00CE213C /* OpenAPSKit */; };
 		45252C95D220E796FDB3B022 /* ConfigEditorDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F8A87AA037BD079BA3528BA /* ConfigEditorDataFlow.swift */; };
 		45717281F743594AA9D87191 /* ConfigEditorRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920DDB21E5D0EB813197500D /* ConfigEditorRootView.swift */; };
 		5075C1608E6249A51495C422 /* TargetsEditorProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BDEA2DC60EDE0A3CA54DC73 /* TargetsEditorProvider.swift */; };
@@ -1299,7 +1299,7 @@
 				B958F1B72BA0711600484851 /* MKRingProgressView in Frameworks */,
 				CE95BF5B2BA770C300DC3DE3 /* LoopKit.framework in Frameworks */,
 				38B17B6625DD90E0005CAE3D /* SwiftDate in Frameworks */,
-				3B5CD1EF2D4915BF00CE213C /* OpenAPSKit in Frameworks */,
+				3B5CD2762D4A74FF00CE213C /* OpenAPSKit in Frameworks */,
 				3833B46D26012030003021B3 /* Algorithms in Frameworks */,
 				CEB434FD28B90B7C00B70274 /* SwiftCharts in Frameworks */,
 				CE95BF5F2BA7715800DC3DE3 /* MockKit.framework in Frameworks */,
@@ -3140,7 +3140,7 @@
 				38DF1788276FC8C400B3528F /* SwiftMessages */,
 				CEB434FC28B90B7C00B70274 /* SwiftCharts */,
 				B958F1B62BA0711600484851 /* MKRingProgressView */,
-				3B5CD1EE2D4915BF00CE213C /* OpenAPSKit */,
+				3B5CD2752D4A74FF00CE213C /* OpenAPSKit */,
 			);
 			productName = FreeAPS;
 			productReference = 388E595825AD948C0019842D /* FreeAPS.app */;
@@ -3283,7 +3283,7 @@
 				38DF1787276FC8C300B3528F /* XCRemoteSwiftPackageReference "SwiftMessages" */,
 				CEB434FB28B90B7C00B70274 /* XCRemoteSwiftPackageReference "SwiftCharts" */,
 				B958F1B52BA0711600484851 /* XCRemoteSwiftPackageReference "MKRingProgressView" */,
-				3B5CD1E82D49126800CE213C /* XCLocalSwiftPackageReference "../OpenAPSKit" */,
+				3B5CD2742D4A74FF00CE213C /* XCRemoteSwiftPackageReference "OpenAPSKit" */,
 			);
 			productRefGroup = 388E595925AD948C0019842D /* Products */;
 			projectDirPath = "";
@@ -4597,13 +4597,6 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCLocalSwiftPackageReference section */
-		3B5CD1E82D49126800CE213C /* XCLocalSwiftPackageReference "../OpenAPSKit" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = ../OpenAPSKit;
-		};
-/* End XCLocalSwiftPackageReference section */
-
 /* Begin XCRemoteSwiftPackageReference section */
 		3811DE0E25C9D37700A708ED /* XCRemoteSwiftPackageReference "Swinject" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -4637,6 +4630,14 @@
 				minimumVersion = 9.0.0;
 			};
 		};
+		3B5CD2742D4A74FF00CE213C /* XCRemoteSwiftPackageReference "OpenAPSKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/kingst/OpenAPSKit.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
+			};
+		};
 		B958F1B52BA0711600484851 /* XCRemoteSwiftPackageReference "MKRingProgressView" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/maxkonovalov/MKRingProgressView.git";
@@ -4681,9 +4682,9 @@
 			package = 38B17B6425DD90E0005CAE3D /* XCRemoteSwiftPackageReference "SwiftDate" */;
 			productName = SwiftDate;
 		};
-		3B5CD1EE2D4915BF00CE213C /* OpenAPSKit */ = {
+		3B5CD2752D4A74FF00CE213C /* OpenAPSKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3B5CD1E82D49126800CE213C /* XCLocalSwiftPackageReference "../OpenAPSKit" */;
+			package = 3B5CD2742D4A74FF00CE213C /* XCRemoteSwiftPackageReference "OpenAPSKit" */;
 			productName = OpenAPSKit;
 		};
 		B958F1B62BA0711600484851 /* MKRingProgressView */ = {

FreeAPS/Sources/APS/OpenAPSSwift/JSONBridge.swift

@@ -8,31 +8,31 @@ enum JSONError: Error {
 }
 
 enum JSONBridge {
-    static func preferences(from: JSON) throws -> OpenAPSKit.Preferences {
+    static func preferences(from: JSON) throws -> OKPreferences {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func pumpSettings(from: JSON) throws -> OpenAPSKit.PumpSettings {
+    static func pumpSettings(from: JSON) throws -> OKPumpSettings {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func bgTargets(from: JSON) throws -> OpenAPSKit.BGTargets {
+    static func bgTargets(from: JSON) throws -> OKBGTargets {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func basalProfile(from: JSON) throws -> [OpenAPSKit.BasalProfileEntry] {
+    static func basalProfile(from: JSON) throws -> [OKBasalProfileEntry] {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func insulinSensitivities(from: JSON) throws -> OpenAPSKit.InsulinSensitivities {
+    static func insulinSensitivities(from: JSON) throws -> OKInsulinSensitivities {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func carbRatios(from: JSON) throws -> OpenAPSKit.CarbRatios {
+    static func carbRatios(from: JSON) throws -> OKCarbRatios {
         try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func tempTargets(from: JSON) throws -> [OpenAPSKit.TempTarget] {
+    static func tempTargets(from: JSON) throws -> [OKTempTarget] {
         try JSONBridge.from(string: from.rawJSON)
     }
 
@@ -40,12 +40,12 @@ enum JSONBridge {
         from.rawJSON
     }
 
-    static func autotune(from: JSON) throws -> OpenAPSKit.Autotune? {
+    static func autotune(from: JSON) throws -> OKAutotune? {
         guard from.rawJSON != RawJSON.null else { return nil }
         return try JSONBridge.from(string: from.rawJSON)
     }
 
-    static func freeapsSettings(from: JSON) throws -> OpenAPSKit.FreeAPSSettings {
+    static func freeapsSettings(from: JSON) throws -> OKFreeAPSSettings {
         try JSONBridge.from(string: from.rawJSON)
     }
 

Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "52d77fc35af7fe71614051dee0b291e2a0d38522eac7ae4d37d2442e81c7530c",
+  "originHash" : "46d76138047ae4a072c17dbca57a7f0f33fdfc4ac6e414d933801acd7488e4bb",
   "pins" : [
     {
       "identity" : "cryptoswift",
@@ -20,6 +20,15 @@
       }
     },
     {
+      "identity" : "openapskit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kingst/OpenAPSKit.git",
+      "state" : {
+        "revision" : "5abb2e9735c71172abf38697825a90f24fbcad61",
+        "version" : "1.0.0"
+      }
+    },
+    {
       "identity" : "slidebutton",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/no-comment/SlideButton",