Prepare for version bump

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "ResearchKit"]
 	path = ResearchKit
-	url = https://github.com/chb/ResearchKit.git
+	url = https://github.com/ResearchKit/ResearchKit.git
 [submodule "Swift-SMART"]
 	path = Swift-SMART
 	url = https://github.com/smart-on-fhir/Swift-SMART.git

.swift-version

@@ -0,0 +1 @@
+3.0

C3PRO.podspec

@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "C3PRO"
-  s.version      = "1.2"
+  s.version      = "2.0.0"
   s.summary      = "Combining 🔥 SMART on FHIR and ResearchKit for data storage into i2b2."
   s.description  = <<-DESC
     Combining 🔥 FHIR and ResearchKit for data storage into i2b2, the C3-PRO iOS
@@ -17,21 +17,22 @@ Pod::Spec.new do |s|
     with a research app.
   DESC
 
-  s.homepage     = "https://c3-pro.chip.org"
+  s.homepage     = "https://c3-pro.org"
   s.license      = 'Apache 2'
   s.authors      = { "Pascal Pfiffner" => "[email protected]" }
-  s.source       = { :git => "https://github.com/p2/c3-pro-ios-framework.git", :tag => s.version.to_s }
+  s.source       = { :git => "https://github.com/c3-pro/c3-pro-ios-framework.git", :tag => s.version.to_s }
 
-  s.platform     = :ios, '8.0'
+  s.platform     = :ios, '9.0'
   s.requires_arc = true
 
   s.source_files = 'Sources/*/*.swift'
   s.resource_bundles = {
     'C3PRO' => ['*.lproj/C3PRO.strings']
   }
   s.frameworks = 'UIKit', 'HealthKit'
-  s.dependency 'SMART', '~> 2.9'
-  s.dependency 'ResearchKit', '~> 1.3'
-  s.dependency 'CryptoSwift', '~> 0.6'
-  s.dependency 'SQLite.swift'
+  s.dependency 'SMART', '~> 3.0.0'
+  s.dependency 'ResearchKit', '~> 1.4.1'
+  s.dependency 'CryptoSwift', '~> 0.6.8'
+  s.dependency 'SQLite.swift', '~> 0.11.2'
+  s.dependency 'JSONWebToken', '~> 2.0.2'
 end

Cartfile

@@ -1,11 +1,11 @@
 # require ResearchKit
-github "ResearchKit/ResearchKit" "master"
+github "ResearchKit/ResearchKit" ~> 1.4.1
 
 # require SMART
-github "smart-on-fhir/Swift-SMART" == 2.8.1
+github "smart-on-fhir/Swift-SMART" ~> 3.0.0
 
 # require CryptoSwift
-github "krzyzanowskim/CryptoSwift" ~> 0.6.0
+github "krzyzanowskim/CryptoSwift" ~> 0.6.8
 
 # require SQLite.swift
 github "stephencelis/SQLite.swift" ~> 0.11.2

Cartfile.resolved

@@ -0,0 +1,5 @@
+github "krzyzanowskim/CryptoSwift" "0.6.8"
+github "ResearchKit/ResearchKit" "1.4.1"
+github "stephencelis/SQLite.swift" "0.11.2"
+github "smart-on-fhir/Swift-SMART" "3.0.0"
+github "kylef/JSONWebToken.swift" "2.1.0"

INSTALL.md

@@ -11,7 +11,7 @@ You can use [Carthage](https://github.com/Carthage/Carthage), a modern iOS frame
 Put this in your `Cartfile`, then run `carthage update --platform "iOS"`:
 
 ```ogdl
-github "C3-PRO/c3-pro-ios-framework.git" ~> 1.8
+github "C3-PRO/c3-pro-ios-framework.git" ~> 2.0
 ```
 
 Check the matrix in the README to see which version you should be using.
@@ -97,5 +97,5 @@ You should now be able to build and run your app.
 CocoaPods
 ---------
 
-Currently, [CocoaPods](http://cocoapods.org) cannot be used to install _C3-PRO_.
+We have also pushed the framework to [CocoaPods](http://cocoapods.org), specify _C3PRO_ as a dependency.
 

README.md

@@ -40,7 +40,7 @@ This framework combines several versioned technologies, here's an overview over
 
    Version |   Swift | ResearchKit |  FHIR |  
 -----------|---------|-------------|-------|----------------
-   **2.0** |     3.0 |         1.4 | 3.0.0 | STU-3
+   **2.0** |     3.0 |       1.4.1 | 3.0.0 | STU-3
    **1.9** |     3.0 |         1.4 | 1.6.0 | STU-3 Ballot
    **1.8** |     3.0 |         1.4 | 1.0.2 | DSTU-2
    **1.2** |     2.2 |         1.3 | 1.4.0 | _not supported_

Sources/DataQueue/DataQueueManager.swift

@@ -142,10 +142,13 @@ class DataQueueManager {
 		seq += 1
 
 		// store new resoure to queue
-		let url = URL(fileURLWithPath: queueDirectory).appendingPathComponent(fileName(for: seq))
+		var url = URL(fileURLWithPath: queueDirectory).appendingPathComponent(fileName(for: seq))
 		do {
 			let data = try JSONSerialization.data(withJSONObject: resource.asJSON(), options: [])
 			try data.write(to: url, options: fileProtection)
+			var skipBackup = URLResourceValues()
+			skipBackup.isExcludedFromBackup = true
+			try url.setResourceValues(skipBackup)
 			logger?.debug("C3-PRO", msg: "Enqueued resource at \(url.path)")
 		}
 		catch let error {

SupportingFiles/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.99</string>
+	<string>2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>2.0.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>