iosdevzone · Mar 22, 2019 · Jan 25, 2019 · Mar 22, 2019 · Mar 22, 2019 · Mar 22, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode10.1
 install:
 - npm install -g playground
 
@@ -8,11 +8,13 @@ env:
     secure: a2fi02GPkxw27jVjW47EkvB/BW/SOIxlmLQJaiZ3xqbKe4udUxKE0ZigD0nVJDmxpiVHv5/Uc9ZQDPtKvvmU9kakusxjBVqMy+IxCYsH4+aDaATdaY9WHvVbARXJGjE/KmKnTfos/P8G8XqXahNKznql/gF2wZNoQIQD49JNk8s=
 
 before_install:
-- bundle install
+- echo Slather disabled -- see .travis.yml
+- echo WARNING not executing gem i bundler -v 1.17.3
+- echo WARNING not execution bundle install
 
 script:
 - echo Available SDKs
 - xcodebuild -showsdks
 - make all
 
-after_success: bundle exec slather coverage --input-format profdata IDZSwiftCommonCrypto.xcodeproj
+after_success: echo WARNING not executing bundle exec slather coverage --input-format profdata IDZSwiftCommonCrypto.xcodeproj
diff --git a/DemoPlayground.playground/Contents.swift b/DemoPlayground.playground/Contents.swift
@@ -36,8 +36,12 @@ for (password, salt, rounds, dkLen, expected) in tests
 {
     let key0 = PBKDF.deriveKey(password: password, salt: salt, prf: .sha1, rounds: uint(rounds), derivedKeyLength: UInt(dkLen))
     let keyString0 = hexString(fromArray: key0)
+    expected
+    keyString0
     let key1 = PBKDF.deriveKey(password: password, salt: arrayFrom(string: salt), prf: .sha1, rounds: uint(rounds), derivedKeyLength: UInt(dkLen))
     let keyString1 = hexString(fromArray: key1)
+    expected
+    keyString1
 }
 
 // MARK: - Random Demo
@@ -123,7 +127,7 @@ test_Cryptor_AES_ECB_2()
 func test_Cryptor_AES_ECB_Short() {
     let key = arrayFrom(hexString:"2b7e151628aed2a6abf7158809cf4f3c")
     let plainText = arrayFrom(hexString: "6bc1bee22e409f96e93d7e11739317")
-    let expectedCipherText = arrayFrom(hexString: "3ad77bb40d7a3660a89ecaf32466ef97")
+    //let expectedCipherText = arrayFrom(hexString: "3ad77bb40d7a3660a89ecaf32466ef97")
 
     let cryptor = Cryptor(operation:.encrypt, algorithm:.aes, options:.ECBMode, key:key, iv:Array<UInt8>())
     let cipherText = cryptor.update(byteArray: plainText)?.final()

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 # Gemfile
 source 'https://rubygems.org'
-gem 'slather', :git => "https://github.com/mattdelves/slather.git", :branch => "feature-profdata"
+gem 'slather'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,44 +1,45 @@
-GIT
-  remote: https://github.com/mattdelves/slather.git
-  revision: d09ce4f5d5928bebdd121f621f530f1751a6c2c9
-  branch: feature-profdata
-  specs:
-    slather (1.8.1)
-      clamp (~> 0.6)
-      nokogiri (~> 1.6.3)
-      xcodeproj (~> 0.27.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.9.1)
-    clamp (0.6.5)
-    colored (1.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    mini_portile (0.6.2)
-    minitest (5.8.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    atomos (0.1.3)
+    claide (1.0.2)
+    clamp (1.3.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.5)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nanaimo (0.2.6)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    slather (2.4.7)
+      CFPropertyList (>= 2.2, < 4)
+      activesupport (>= 4.0.2, < 5)
+      clamp (~> 1.3)
+      nokogiri (~> 1.8)
+      xcodeproj (~> 1.7)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (0.27.2)
-      activesupport (>= 3)
-      claide (~> 0.9.1)
-      colored (~> 1.2)
+    xcodeproj (1.8.1)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  slather!
+  slather
 
 BUNDLED WITH
-   1.10.6
+   2.0.1
diff --git a/GenerateCommonCryptoModule b/GenerateCommonCryptoModule
diff --git a/GenerateCommonCryptoModule.swift b/GenerateCommonCryptoModule.swift
diff --git a/IDZSwiftCommonCrypto.podspec b/IDZSwiftCommonCrypto.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "IDZSwiftCommonCrypto"
-  s.version      = "0.10.0"
+  s.version      = "0.11.0"
   s.summary      = "A wrapper for Apple's Common Crypto library written in Swift."
 
   s.homepage     = "https://github.com/iosdevzone/IDZSwiftCommonCrypto"
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.11'
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
-  s.watchos.deployment_target = '2.0'
+  s.watchos.deployment_target = '5.1'
 
   s.source       = { :git => "https://github.com/iosdevzone/IDZSwiftCommonCrypto.git", :tag => s.version.to_s }
 
@@ -46,7 +46,7 @@ CMD
 
   # Make sure we can find the dummy frameworks
   s.pod_target_xcconfig = {
-  "SWIFT_VERSION" => "3.0",
+  "SWIFT_VERSION" => "4.2",
   "SWIFT_INCLUDE_PATHS" => "${PODS_ROOT}/IDZSwiftCommonCrypto/Frameworks/$(PLATFORM_NAME)",
   "FRAMEWORK_SEARCH_PATHS" => "${PODS_ROOT}/IDZSwiftCommonCrypto/Frameworks/$(PLATFORM_NAME)",
   "APPLICATION_EXTENSION_API_ONLY" => "YES"