Merge pull request #242 from DP-3T/develop

Release Version 2.1.0
DP-3T · Dec 22, 2020 · 470549e · 470549e
2 parents 522938d + e1b1ba2
commit 470549e
Show file tree

Hide file tree

Showing 33 changed files with 398 additions and 105 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,8 +14,8 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 12
-      run: sudo xcode-select --switch /Applications/Xcode_12.app
+    - name: Switch to Xcode 12.3
+      run: sudo xcode-select --switch /Applications/Xcode_12.3.app
 
     - name: Fastlane test
       run: fastlane test
@@ -34,8 +34,8 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 12
-      run: sudo xcode-select --switch /Applications/Xcode_12.app
+    - name: Switch to Xcode 12.3
+      run: sudo xcode-select --switch /Applications/Xcode_12.3.app
 
     # Compile sample app for iOS Simulator (no signing)
     - name: Compile and run tests

diff --git a/.github/workflows/deploy_to_cocoapods.yml b/.github/workflows/deploy_to_cocoapods.yml
@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Switch to Xcode 12
-      run: sudo xcode-select --switch /Applications/Xcode_12.app
+    - name: Switch to Xcode 12.3
+      run: sudo xcode-select --switch /Applications/Xcode_12.3.app
 
     - name: Install Cocoapods
       run: gem install cocoapods

diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
@@ -11,8 +11,8 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 12
-      run: sudo xcode-select --switch /Applications/Xcode_12.app
+    - name: Switch to Xcode 12.3
+      run: sudo xcode-select --switch /Applications/Xcode_12.3.app
 
     - name: Run fastlane build
       env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog for DP3T-SDK iOS
 
+## Version 2.1.0 (21.12.2020)
+- Add support for iOS 12.5 
+- Fix timeshift detection
+
 ## Version 2.0.0 (29.10.2020)
+
+IMPORTANT: Make sure to update dp3t-sdk-backend to 2.0.0 or higher as this version of the dp3t-sdk-ios requires new API endpoints.
+
 - 'Bearer' is not added as a prefix to auth key if using HTTPAuthorizationHeader auth method. 
 - HTTPAuthorizationBearer auth method is deprecated
 - updates to Exposure Notification Framework version 2

diff --git a/DP3TSDK.podspec b/DP3TSDK.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "DP3TSDK"
-  spec.version      = ENV['LIB_VERSION'] || '2.0.0'
+  spec.version      = ENV['LIB_VERSION'] || '2.1.0'
   spec.summary      = "Open protocol for COVID-19 proximity tracing using Bluetooth Low Energy on mobile devices"
 
   spec.description  = <<-DESC

diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "DP3TSDK",
     platforms: [
-        .iOS("13.7"),
+        .iOS(.v12),
     ],
     products: [
         .library(
@@ -14,7 +14,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/IBM-Swift/Swift-JWT.git", from: "3.6.1"),
+        .package(url: "https://github.com/Kitura/Swift-JWT.git", from: "3.6.1"),
         .package(url: "https://github.com/weichsel/ZIPFoundation/", .upToNextMajor(from: "0.9.0")),
     ],
     targets: [

diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ DP3T-SDK is available through [Cocoapods](https://cocoapods.org/)
 
   ```ruby
 
-  pod 'DP3TSDK', => '2.0.0'
+  pod 'DP3TSDK', => '2.1.0'
 
   ```
 

diff --git a/SampleApp/DP3TSampleApp.xcodeproj/project.pbxproj b/SampleApp/DP3TSampleApp.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
 		F88A3BDE2508AB4A001DDE5B /* ENExposureConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F88A3BDD2508AB4A001DDE5B /* ENExposureConfiguration.swift */; };
 		F89B452424731DD40011AD07 /* KeysViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89B452324731DD40011AD07 /* KeysViewController.swift */; };
 		F8A7E69D24731FB400213CE2 /* NetworkingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A7E69C24731FB400213CE2 /* NetworkingHelper.swift */; };
+		F8D581032588E83A00307C2B /* ExposureNotification.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D580FA2588E61E00307C2B /* ExposureNotification.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		F8D5814F2589EC5A00307C2B /* DiffableDataSources in Frameworks */ = {isa = PBXBuildFile; productRef = F8D5814E2589EC5A00307C2B /* DiffableDataSources */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -48,16 +50,19 @@
 		F88A3BDD2508AB4A001DDE5B /* ENExposureConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ENExposureConfiguration.swift; path = ../../../Sources/DP3TSDK/Matching/ENExposureConfiguration.swift; sourceTree = "<group>"; };
 		F89B452324731DD40011AD07 /* KeysViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeysViewController.swift; sourceTree = "<group>"; };
 		F8A7E69C24731FB400213CE2 /* NetworkingHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkingHelper.swift; sourceTree = "<group>"; };
+		F8D580FA2588E61E00307C2B /* ExposureNotification.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExposureNotification.framework; path = System/Library/Frameworks/ExposureNotification.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		F83BE133242DDC450043FA1E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F8D581032588E83A00307C2B /* ExposureNotification.framework in Frameworks */,
 				F83079972492909A005D3C65 /* SQLite in Frameworks */,
 				F8287D15246A78570022CFD9 /* DP3TSDK in Frameworks */,
 				DF07D0A62451E59200CFD431 /* Alamofire in Frameworks */,
+				F8D5814F2589EC5A00307C2B /* DiffableDataSources in Frameworks */,
 				F83BE150242DDFF60043FA1E /* SnapKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -117,6 +122,7 @@
 		F83BE151242DE0C00043FA1E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				F8D580FA2588E61E00307C2B /* ExposureNotification.framework */,
 				F83BE17C242DE1BF0043FA1E /* covid-tracing-ios-sdk */,
 			);
 			name = Frameworks;
@@ -143,6 +149,7 @@
 				DF07D0A52451E59200CFD431 /* Alamofire */,
 				F8287D14246A78570022CFD9 /* DP3TSDK */,
 				F83079962492909A005D3C65 /* SQLite */,
+				F8D5814E2589EC5A00307C2B /* DiffableDataSources */,
 			);
 			productName = CovidTracingTestApp;
 			productReference = F83BE136242DDC450043FA1E /* DP3TSampleApp.app */;
@@ -176,6 +183,7 @@
 				F83BE14E242DDFF60043FA1E /* XCRemoteSwiftPackageReference "SnapKit" */,
 				DF07D0A42451E59200CFD431 /* XCRemoteSwiftPackageReference "Alamofire" */,
 				F83079952492909A005D3C65 /* XCRemoteSwiftPackageReference "SQLite" */,
+				F8D5814D2589EC5A00307C2B /* XCRemoteSwiftPackageReference "DiffableDataSources" */,
 			);
 			productRefGroup = F83BE137242DDC450043FA1E /* Products */;
 			projectDirPath = "";
@@ -285,7 +293,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -305,7 +313,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = XPL89PTG92;
 				INFOPLIST_FILE = DP3TSampleApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -366,7 +374,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -386,7 +394,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = XPL89PTG92;
 				INFOPLIST_FILE = DP3TSampleApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -449,6 +457,14 @@
 				minimumVersion = 5.0.1;
 			};
 		};
+		F8D5814D2589EC5A00307C2B /* XCRemoteSwiftPackageReference "DiffableDataSources" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/ra1028/DiffableDataSources";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.4.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -471,6 +487,11 @@
 			package = F83BE14E242DDFF60043FA1E /* XCRemoteSwiftPackageReference "SnapKit" */;
 			productName = SnapKit;
 		};
+		F8D5814E2589EC5A00307C2B /* DiffableDataSources */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = F8D5814D2589EC5A00307C2B /* XCRemoteSwiftPackageReference "DiffableDataSources" */;
+			productName = DiffableDataSources;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = F83BE12E242DDC450043FA1E /* Project object */;

diff --git a/SampleApp/DP3TSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SampleApp/DP3TSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,53 +6,71 @@
         "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
         "state": {
           "branch": null,
-          "revision": "fca036f7aeca07124067cb6e0c12b0ad6359e3d4",
-          "version": "5.1.0"
+          "revision": "9e0328127dfb801cefe8ac53a13c0c90a7770448",
+          "version": "5.4.0"
         }
       },
       {
         "package": "Cryptor",
-        "repositoryURL": "https://github.com/IBM-Swift/BlueCryptor.git",
+        "repositoryURL": "https://github.com/Kitura/BlueCryptor.git",
         "state": {
           "branch": null,
-          "revision": "12d2bf3ec7207ec3cd004b9582f69ef5fae1da3b",
-          "version": "1.0.32"
+          "revision": "ee5880e031da4c609f372cf7472476ab51d5dd19",
+          "version": "1.0.200"
         }
       },
       {
         "package": "CryptorECC",
-        "repositoryURL": "https://github.com/IBM-Swift/BlueECC.git",
+        "repositoryURL": "https://github.com/Kitura/BlueECC.git",
         "state": {
           "branch": null,
-          "revision": "73f362cb0d9c5f1fd0089240d7b293cd2bff18db",
-          "version": "1.2.5"
+          "revision": "baf6ed3fc1a622675f0041b4aff7c02dd1a93818",
+          "version": "1.2.200"
         }
       },
       {
         "package": "CryptorRSA",
-        "repositoryURL": "https://github.com/IBM-Swift/BlueRSA.git",
+        "repositoryURL": "https://github.com/Kitura/BlueRSA.git",
         "state": {
           "branch": null,
-          "revision": "8ea901f2582296837d88f882b0fa5a0601759598",
-          "version": "1.0.35"
+          "revision": "c885fcdbe1b04718cb46d747387137653c030f6c",
+          "version": "1.0.200"
+        }
+      },
+      {
+        "package": "DiffableDataSources",
+        "repositoryURL": "https://github.com/ra1028/DiffableDataSources",
+        "state": {
+          "branch": null,
+          "revision": "581b4f8d1634e83c6b33caaafdc6a115a74650c3",
+          "version": "0.4.0"
+        }
+      },
+      {
+        "package": "DifferenceKit",
+        "repositoryURL": "https://github.com/ra1028/DifferenceKit.git",
+        "state": {
+          "branch": null,
+          "revision": "14c66681e12a38b81045f44c6c29724a0d4b0e72",
+          "version": "1.1.5"
         }
       },
       {
         "package": "KituraContracts",
-        "repositoryURL": "https://github.com/IBM-Swift/KituraContracts.git",
+        "repositoryURL": "https://github.com/Kitura/KituraContracts.git",
         "state": {
           "branch": null,
-          "revision": "a30e2fb79e926672776a05ec6b919c239870a221",
-          "version": "1.2.1"
+          "revision": "8418006e39e2efae9b31ae92721cb597ac29c617",
+          "version": "1.2.200"
         }
       },
       {
         "package": "LoggerAPI",
-        "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
+        "repositoryURL": "https://github.com/Kitura/LoggerAPI.git",
         "state": {
           "branch": null,
-          "revision": "3357dd9526cdf9436fa63bb792b669e6efdc43da",
-          "version": "1.9.0"
+          "revision": "e82d34eab3f0b05391082b11ea07d3b70d2f65bb",
+          "version": "1.9.200"
         }
       },
       {
@@ -75,20 +93,20 @@
       },
       {
         "package": "SwiftJWT",
-        "repositoryURL": "https://github.com/IBM-Swift/Swift-JWT.git",
+        "repositoryURL": "https://github.com/Kitura/Swift-JWT.git",
         "state": {
           "branch": null,
-          "revision": "0d435423d12e61c0d14adb6d04396c08a6a650f1",
-          "version": "3.6.1"
+          "revision": "2f2fc12ae88660e0760b04d9e6c341517b31ad7b",
+          "version": "3.6.200"
         }
       },
       {
         "package": "swift-log",
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
-          "version": "1.2.0"
+          "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
+          "version": "1.4.0"
         }
       },
       {

diff --git a/SampleApp/DP3TSampleApp/ControlViewController.swift b/SampleApp/DP3TSampleApp/ControlViewController.swift
@@ -35,7 +35,11 @@ class ControlViewController: UIViewController {
     init() {
         super.init(nibName: nil, bundle: nil)
         title = "Controls"
-        tabBarItem = UITabBarItem(title: title, image: UIImage(systemName: "doc.text"), tag: 0)
+        if #available(iOS 13.0, *) {
+            tabBarItem = UITabBarItem(title: title, image: UIImage(systemName: "doc.text"), tag: 0)
+        } else {
+            tabBarItem = UITabBarItem(title: title, image: nil, tag: 0)
+        }
         segmentedControl.selectedSegmentIndex = 1
         segmentedControl.addTarget(self, action: #selector(segmentedControlChanges), for: .valueChanged)
 
@@ -66,7 +70,11 @@ class ControlViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = .systemBackground
+        if #available(iOS 13.0, *) {
+            self.view.backgroundColor = .systemBackground
+        } else {
+            self.view.backgroundColor = .white
+        }
         view.addSubview(scrollView)
         scrollView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -88,7 +96,11 @@ class ControlViewController: UIViewController {
         statusLabel.font = .systemFont(ofSize: 18)
         statusLabel.textAlignment = .center
         statusLabel.numberOfLines = 0
-        statusLabel.backgroundColor = .systemGroupedBackground
+        if #available(iOS 13.0, *) {
+            statusLabel.backgroundColor = .systemGroupedBackground
+        } else {
+            statusLabel.backgroundColor = .white
+        }
         self.updateUI(DP3TTracing.status)
 
         stackView.addArrangedSubview(statusLabel)
-Original file line number
+Diff line change
@@ Expand Up @@
       ```ruby
-      pod 'DP3TSDK', => '2.0.0'
+      pod 'DP3TSDK', => '2.1.0'
       ```
@@ Expand Down @@