Merge branch 'release/0.3.0'

nsagora · Mar 4, 2017 · 9adc790 · 9adc790
2 parents 79670d6 + 64e862d
commit 9adc790
Show file tree

Hide file tree

Showing 14 changed files with 104 additions and 120 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.2
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
@@ -9,21 +9,22 @@ env:
   - OSX_FRAMEWORK_SCHEME="ValidationComponents macOS"
   - TVOS_FRAMEWORK_SCHEME="ValidationComponents tvOS"
   - WATCHOS_FRAMEWORK_SCHEME="ValidationComponents watchOS"
-  - IOS_SDK=iphonesimulator10.0
-  - MACOS_SDK=macosx10.12
-  - TVOS_SDK=appletvsimulator10.0
-  - WATCHOS_SDK=watchsimulator3.0
+  - IOS_SDK=iphonesimulator
+  - MACOS_SDK=macosx
+  - TVOS_SDK=appletvsimulator
+  - WATCHOS_SDK=watchsimulator
   matrix:
-    - DESTINATION="OS=10.0,name=iPhone 6S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                     SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$MACOS_SDK"   CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
-    - DESTINATION="OS=10.0,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES"
-    - DESTINATION="OS=3.0,name=Apple Watch - 42mm"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=latest,name=iPhone 7"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="arch=x86_64"                       SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$MACOS_SDK"   CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=latest,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=latest,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
 
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
   - gem install xcpretty --pre --no-rdoc --no-ri --no-document --quiet
   - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
+  - echo y | fastlane snapshot reset_simulators
 
 script:
   - set -o pipefail

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "alexcristea/validation-kit" "develop"
+github "nsagora/validation-toolkit" ~> 0.4.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb"
+github "nsagora/validation-toolkit" "0.4.1"
diff --git a/Sources/EmailValidationPredicate.swift b/Sources/EmailValidationPredicate.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import ValidationKit
+import ValidationToolkit
 
 public struct EmailValidationPredicate: ValidationPredicate {
 

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/URLValidationRule.swift b/Sources/URLValidationRule.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import ValidationKit
+import ValidationToolkit
 
 public struct URLValidationPredicate:  ValidationPredicate{
 

diff --git a/Sources/ValueMatchingValidationPredicate.swift b/Sources/ValueMatchingValidationPredicate.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import ValidationKit
+import ValidationToolkit
 
 public struct ValueMatchingValidationPredicate<T:Equatable>: ValidationPredicate {
 

diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/ValidationComponents.podspec b/ValidationComponents.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ValidationComponents'
-  s.version          = '0.2.0'
+  s.version          = '0.3.0'
   s.summary          = 'Lightweight framework for input validation'
 
 # This description is used to generate tags and improve search results.
@@ -30,5 +30,7 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
 
-  s.source_files = 'Sources/**'
+  s.source_files = 'Sources/*.swift'
+
+  s.dependency 'ValidationToolkit', '~> 0.4.1'
 end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "alexcristea/validation-kit" "develop"
		github "nsagora/validation-toolkit" ~> 0.4.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb"
		github "nsagora/validation-toolkit" "0.4.1"