Skip to content
This repository was archived by the owner on Jul 3, 2019. It is now read-only.

Commit 9adc790

Browse files
committed
Merge branch 'release/0.3.0'
2 parents 79670d6 + 64e862d commit 9adc790

14 files changed

+104
-120
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode8.2
33
env:
44
global:
55
- LC_CTYPE=en_US.UTF-8
@@ -9,21 +9,22 @@ env:
99
- OSX_FRAMEWORK_SCHEME="ValidationComponents macOS"
1010
- TVOS_FRAMEWORK_SCHEME="ValidationComponents tvOS"
1111
- WATCHOS_FRAMEWORK_SCHEME="ValidationComponents watchOS"
12-
- IOS_SDK=iphonesimulator10.0
13-
- MACOS_SDK=macosx10.12
14-
- TVOS_SDK=appletvsimulator10.0
15-
- WATCHOS_SDK=watchsimulator3.0
12+
- IOS_SDK=iphonesimulator
13+
- MACOS_SDK=macosx
14+
- TVOS_SDK=appletvsimulator
15+
- WATCHOS_SDK=watchsimulator
1616
matrix:
17-
- DESTINATION="OS=10.0,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
18-
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
19-
- DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES"
20-
- DESTINATION="OS=3.0,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
17+
- DESTINATION="OS=latest,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES"
18+
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO"
19+
- DESTINATION="OS=latest,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO"
20+
- DESTINATION="OS=latest,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
2121

2222
before_install:
2323
- brew update
2424
- brew outdated carthage || brew upgrade carthage
2525
- gem install xcpretty --pre --no-rdoc --no-ri --no-document --quiet
2626
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
27+
- echo y | fastlane snapshot reset_simulators
2728

2829
script:
2930
- set -o pipefail

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "alexcristea/validation-kit" "develop"
1+
github "nsagora/validation-toolkit" ~> 0.4.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb"
1+
github "nsagora/validation-toolkit" "0.4.1"

Sources/EmailValidationPredicate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import ValidationKit
10+
import ValidationToolkit
1111

1212
public struct EmailValidationPredicate: ValidationPredicate {
1313

Sources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.2.0</string>
18+
<string>0.3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

Sources/URLValidationRule.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import ValidationKit
10+
import ValidationToolkit
1111

1212
public struct URLValidationPredicate: ValidationPredicate{
1313

Sources/ValueMatchingValidationPredicate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import ValidationKit
10+
import ValidationToolkit
1111

1212
public struct ValueMatchingValidationPredicate<T:Equatable>: ValidationPredicate {
1313

Tests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.2.0</string>
18+
<string>0.3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

ValidationComponents.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'ValidationComponents'
11-
s.version = '0.2.0'
11+
s.version = '0.3.0'
1212
s.summary = 'Lightweight framework for input validation'
1313

1414
# This description is used to generate tags and improve search results.
@@ -30,5 +30,7 @@ Pod::Spec.new do |s|
3030
s.tvos.deployment_target = '9.0'
3131
s.watchos.deployment_target = '2.0'
3232

33-
s.source_files = 'Sources/**'
33+
s.source_files = 'Sources/*.swift'
34+
35+
s.dependency 'ValidationToolkit', '~> 0.4.1'
3436
end

0 commit comments

Comments
 (0)