Merge pull request #274 from NordicSemiconductor/develop

Version 4.3.0
NordicSemiconductor · Mar 1, 2019 · f5fc7bc · f5fc7bc
2 parents 422caf5 + 71db20f
commit f5fc7bc
Show file tree

Hide file tree

Showing 136 changed files with 4,363 additions and 7,653 deletions.
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "weichsel/ZIPFoundation" ~> 0.9
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,11 +1,11 @@
 use_frameworks!
 target 'iOSDFULibrary_Example' do
-  platform :ios, '8.0'
+  platform :ios, '9.0'
   pod 'iOSDFULibrary', :path => '../'
 end
 
 target 'iOSDFULibrary_Tests' do
-  platform :ios, '8.0'
+  platform :ios, '9.0'
   pod 'iOSDFULibrary', :path => '../'
 end
 

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,23 +1,23 @@
 PODS:
   - iOSDFULibrary (4.2.2):
-    - Zip (~> 1.0)
-  - Zip (1.1.0)
+    - ZIPFoundation (~> 0.9.8)
+  - ZIPFoundation (0.9.8)
 
 DEPENDENCIES:
   - iOSDFULibrary (from `../`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
-    - Zip
+    - ZIPFoundation
 
 EXTERNAL SOURCES:
   iOSDFULibrary:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: 6bdbe1c17821f6fe2be1ec987fe55d35d1f178b6
-  Zip: 8877eede3dda76bcac281225c20e71c25270774c
+  iOSDFULibrary: 8571da934e7bd1f600f8861a1c1bb92df5d45e3f
+  ZIPFoundation: b1f07e4409baf1641f3fe5948b2a1c3f5c500cb1
 
-PODFILE CHECKSUM: e69e51e1629146ef9887fb3e893d62b3afd2b845
+PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.6.1
diff --git a/Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json b/Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Zip-iOS.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Zip-iOS.xcscheme
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Zip-macOS.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Zip-macOS.xcscheme
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-iOS.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-iOS.xcscheme
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-macOS.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-macOS.xcscheme
diff --git a/...Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-acknowledgements.markdown b/...Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-acknowledgements.markdown
diff --git a/...upport Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-acknowledgements.plist b/...upport Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-acknowledgements.plist
diff --git a/.../Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-frameworks.sh b/.../Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example-frameworks.sh
diff --git a/...Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.debug.xcconfig b/...Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.debug.xcconfig
diff --git a/...rget Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.release.xcconfig b/...rget Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.release.xcconfig
diff --git a/...les/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests-acknowledgements.markdown b/...les/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests-acknowledgements.markdown