Revert DP3T dependency back to SWIFT dependency

ios/Divoc.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -13,6 +13,7 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		1EE3D90024DADD5E006C7B1F /* DP3TSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 1EE3D8FF24DADD5E006C7B1F /* DP3TSDK */; };
 		5C8E635409871A7102F65861 /* libPods-Divoc-DivocTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A7161B0CB97C2B6786008D8 /* libPods-Divoc-DivocTests.a */; };
 		80377DBA24B0F41C005452C6 /* TracingLocalPush.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80377DB924B0F41C005452C6 /* TracingLocalPush.swift */; };
 		80377DBE24B0F83F005452C6 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80377DBC24B0F83F005452C6 /* Keychain.swift */; };
@@ -176,6 +177,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1EE3D90024DADD5E006C7B1F /* DP3TSDK in Frameworks */,
 				08D80D04D99F6A4FE1D678E5 /* libPods-Divoc.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -485,6 +487,7 @@
 			);
 			name = Divoc;
 			packageProductDependencies = (
+				1EE3D8FF24DADD5E006C7B1F /* DP3TSDK */,
 			);
 			productName = Divoc;
 			productReference = 13B07F961A680F5B00A75B9A /* STAYAWAY.app */;
@@ -519,6 +522,7 @@
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			packageReferences = (
+				1EE3D8FE24DADD5D006C7B1F /* XCRemoteSwiftPackageReference "dp3t-sdk-ios" */,
 			);
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
@@ -878,7 +882,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = H4F6Z9HC74;
+				DEVELOPMENT_TEAM = VB258YUFG3;
 				INFOPLIST_FILE = "Divoc/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -892,7 +896,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "fct.inesctec.stayaway${BUNDLE_ID_SUFFIX}";
 				PRODUCT_NAME = STAYAWAY;
-				PROVISIONING_PROFILE_SPECIFIER = "STAYAWAY EN";
+				PROVISIONING_PROFILE_SPECIFIER = GAEN_DEV;
 				SWIFT_MODULE_NAME = STAYAWAY_COVID;
 				SWIFT_OBJC_BRIDGING_HEADER = "Divoc/Bridge/Divoc-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
@@ -1628,6 +1632,25 @@
 			defaultConfigurationName = ProductionRelease;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		1EE3D8FE24DADD5D006C7B1F /* XCRemoteSwiftPackageReference "dp3t-sdk-ios" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/DP-3T/dp3t-sdk-ios.git";
+			requirement = {
+				kind = revision;
+				revision = c9f2db9d11f32b1236180171594f6d6ccf8e17af;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		1EE3D8FF24DADD5E006C7B1F /* DP3TSDK */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 1EE3D8FE24DADD5D006C7B1F /* XCRemoteSwiftPackageReference "dp3t-sdk-ios" */;
+			productName = DP3TSDK;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
 }

ios/Divoc.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,97 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Cryptor",
+        "repositoryURL": "https://github.com/IBM-Swift/BlueCryptor.git",
+        "state": {
+          "branch": null,
+          "revision": "12d2bf3ec7207ec3cd004b9582f69ef5fae1da3b",
+          "version": "1.0.32"
+        }
+      },
+      {
+        "package": "CryptorECC",
+        "repositoryURL": "https://github.com/IBM-Swift/BlueECC.git",
+        "state": {
+          "branch": null,
+          "revision": "73f362cb0d9c5f1fd0089240d7b293cd2bff18db",
+          "version": "1.2.5"
+        }
+      },
+      {
+        "package": "CryptorRSA",
+        "repositoryURL": "https://github.com/IBM-Swift/BlueRSA.git",
+        "state": {
+          "branch": null,
+          "revision": "8ea901f2582296837d88f882b0fa5a0601759598",
+          "version": "1.0.35"
+        }
+      },
+      {
+        "package": "DP3TSDK",
+        "repositoryURL": "https://github.com/DP-3T/dp3t-sdk-ios.git",
+        "state": {
+          "branch": null,
+          "revision": "c9f2db9d11f32b1236180171594f6d6ccf8e17af",
+          "version": null
+        }
+      },
+      {
+        "package": "KituraContracts",
+        "repositoryURL": "https://github.com/IBM-Swift/KituraContracts.git",
+        "state": {
+          "branch": null,
+          "revision": "a30e2fb79e926672776a05ec6b919c239870a221",
+          "version": "1.2.1"
+        }
+      },
+      {
+        "package": "LoggerAPI",
+        "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
+        "state": {
+          "branch": null,
+          "revision": "3357dd9526cdf9436fa63bb792b669e6efdc43da",
+          "version": "1.9.0"
+        }
+      },
+      {
+        "package": "SwiftJWT",
+        "repositoryURL": "https://github.com/IBM-Swift/Swift-JWT.git",
+        "state": {
+          "branch": null,
+          "revision": "0d435423d12e61c0d14adb6d04396c08a6a650f1",
+          "version": "3.6.1"
+        }
+      },
+      {
+        "package": "swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log.git",
+        "state": {
+          "branch": null,
+          "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
+          "version": "1.4.0"
+        }
+      },
+      {
+        "package": "SwiftProtobuf",
+        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
+        "state": {
+          "branch": null,
+          "revision": "f33185acd089405d365982ccab2f58469052a545",
+          "version": "1.10.2"
+        }
+      },
+      {
+        "package": "ZIPFoundation",
+        "repositoryURL": "https://github.com/weichsel/ZIPFoundation/",
+        "state": {
+          "branch": null,
+          "revision": "ec32d62d412578542c0ffb7a6ce34d3e64b43b94",
+          "version": "0.9.11"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

ios/Divoc/Bridge/TracingManagerGlue.swift

@@ -230,7 +230,7 @@ func wrapState(_ state: TracingState) -> Dictionary<String, Any> {
           case .notHTTPResponse:
             NSLog("Sync. Networking notHTTPResponse error ")
           case .HTTPFailureResponse(status: let status):
-            NSLog("Sync. Networking HTTPFailureResponse error \(status.status)")
+            NSLog("Sync. Networking HTTPFailureResponse error \(status)")
           case .noDataReturned:
             NSLog("Sync. Networking noDataReturned error ")
           case .couldNotParseData(error: let error2, origin: let origin):

ios/Divoc/Supporting Files/Info.plist

@@ -4,9 +4,8 @@
 <dict>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
-		<string>org.dpppt.synctask</string>
 		<string>org.dpppt.exposure-notification</string>
-		<string>org.dpppt.fakepublishmanager</string>
+    <string>org.dpppt.refresh</string>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>

ios/Podfile

@@ -53,7 +53,7 @@ target 'Divoc' do
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
   pod 'TrustKit', '~> 1.6'
-  pod 'DP3TSDK', '~> 1.1'
+  #pod 'DP3TSDK', '~> 1.1'
 
   # Permissions
   permissions_path = '../node_modules/react-native-permissions/ios'

ios/Podfile.lock

@@ -1,13 +1,6 @@
 PODS:
-  - BlueCryptor (1.0.32)
-  - BlueECC (1.2.5)
-  - BlueRSA (1.0.34)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
-  - DP3TSDK (1.1.0):
-    - SwiftJWT (~> 3.5)
-    - SwiftProtobuf (~> 1.6)
-    - ZIPFoundation (~> 0.9)
   - FBLazyVector (0.62.2)
   - FBReactNativeSpec (0.62.2):
     - Folly (= 2018.10.22.00)
@@ -26,11 +19,6 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - KituraContracts (1.2.1):
-    - LoggerAPI (~> 1.7)
-  - LoggerAPI (1.9.0):
-    - Logging (~> 1.1)
-  - Logging (1.2.0)
   - Permission-Notifications (2.1.5):
     - RNPermissions
   - RCTRequired (0.62.2)
@@ -285,20 +273,11 @@ PODS:
     - React
   - RNVectorIcons (6.6.0):
     - React
-  - SwiftJWT (3.5.3):
-    - BlueCryptor (~> 1.0)
-    - BlueECC (~> 1.1)
-    - BlueRSA (~> 1.0)
-    - KituraContracts (~> 1.1)
-    - LoggerAPI (~> 1.7)
-  - SwiftProtobuf (1.10.2)
   - TrustKit (1.6.5)
   - Yoga (1.14.0)
-  - ZIPFoundation (0.9.11)
 
 DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - DP3TSDK (~> 1.1)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
@@ -345,20 +324,9 @@ DEPENDENCIES:
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
-    - TrustKit
   trunk:
-    - BlueCryptor
-    - BlueECC
-    - BlueRSA
     - boost-for-react-native
-    - DP3TSDK
-    - KituraContracts
-    - LoggerAPI
-    - Logging
-    - SwiftJWT
-    - SwiftProtobuf
-    - ZIPFoundation
+    - TrustKit
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -445,20 +413,13 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
-  BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
-  BlueRSA: 6f9776d62d9773502415a7db3bcbb2bbb3f71fc3
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
-  DP3TSDK: 201bfa5d196603503f326b42110e8614d7d3c58f
   FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
   FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
-  LoggerAPI: fb78461eedac5316b290f2404d88b9d614d96c57
-  Logging: 7838d379d234d7e5ae1265fa02804a9084caf04c
-  Permission-Notifications: 5ecb0f433b585c5621dc30b168772d60ae8574c2
+  Permission-Notifications: 231d0e1db2300b686548587d384ba414e6a93332
   RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035
   RCTTypeSafety: 93006131180074cffa227a1075802c89a49dd4ce
   React: 29a8b1a02bd764fb7644ef04019270849b9a7ac3
@@ -469,10 +430,10 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da
   React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493
   react-native-config: ae9ef3bdbf539f2d14ebaf4ebeba508f766e066a
-  react-native-netinfo: eed0fb1d6a9424e98ce686f92aad62ff427d4bc9
-  react-native-safe-area-context: c39fc20a20cd66ebf1d56c6f8b8711142fbfee98
+  react-native-netinfo: cd479ab1b67cdd1cb1403a99ecdb24190a6dd7ef
+  react-native-safe-area-context: ef6f16c66b0797ecae1bf86c103dfb3dc16fc33d
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-version-number: 15563dc4145a94aabfc1faab2a9af10174a4204e
+  react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
   React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
   React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
   React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71
@@ -483,22 +444,19 @@ SPEC CHECKSUMS:
   React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d
   React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256
   ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
-  RNCAsyncStorage: db711e29e5e0500d9bd21aa0c2e397efa45302b1
-  RNCCheckbox: 2e90172b1ba7a5c7d88f50f6243fe16566bf03aa
-  RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
+  RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
+  RNCCheckbox: 357578d3b42652c78ee9a1bb9bcfc3195af6e161
+  RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
   RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38
-  RNLocalize: fc27ee5878ce5a3af73873fb2d8e866e0d1e6d84
-  RNPermissions: 1888705aebcc81714efa5dbff94351e4388ae012
+  RNLocalize: b6df30cc25ae736d37874f9bce13351db2f56796
+  RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43
   RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
   RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
-  SwiftJWT: 9a47a71090cae25767078756b5810e3b630aa9a7
-  SwiftProtobuf: bec1ae7d686ff73dd09d79866154f4970b891410
   TrustKit: 073855e3adecd317417bda4ac9e9ac54a2e3b9f2
   Yoga: 3ebccbdd559724312790e7742142d062476b698e
-  ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
-PODFILE CHECKSUM: 680fd0a3283a73c5a194cc3d5f6f124f6b40cdc5
+PODFILE CHECKSUM: 46a276423d5a8765afd892b1d7ca79407f366aa4
 
 COCOAPODS: 1.8.4