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

Commit 76516a1

Browse files
committed
Merge branch 'feature/cocoapods' into develop
2 parents 91ea91b + c45ffcd commit 76516a1

20 files changed

+91
-16
lines changed

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ DerivedData
4545
# We recommend against adding the Pods directory to your .gitignore. However
4646
# you should judge for yourself, the pros and cons are mentioned at:
4747
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
48-
#
49-
# Pods/
48+
49+
Pods/
5050

5151
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
5252

@@ -104,4 +104,8 @@ fastlane/build
104104
## Covers Carthage
105105

106106
Carthage/Checkouts
107-
Carthage/Build
107+
Carthage/Build
108+
109+
## Covers Swift Package
110+
111+
.build

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
global:
55
- LC_CTYPE=en_US.UTF-8
66
- LANG=en_US.UTF-8
7-
- PROJECT=framework/ValidationComponents.xcodeproj
7+
- PROJECT=ValidationComponents.xcodeproj
88
- IOS_FRAMEWORK_SCHEME="ValidationComponents iOS"
99
- OSX_FRAMEWORK_SCHEME="ValidationComponents macOS"
1010
- TVOS_FRAMEWORK_SCHEME="ValidationComponents tvOS"
@@ -14,10 +14,10 @@ env:
1414
- TVOS_SDK=appletvsimulator10.0
1515
- WATCHOS_SDK=watchsimulator3.0
1616
matrix:
17-
- DESTINATION="OS=10.0,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO"
18-
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO"
19-
- DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES"
20-
- DESTINATION="OS=3.0,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO"
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"
2121

2222
before_install:
2323
- brew update
@@ -32,6 +32,9 @@ script:
3232
else
3333
xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration "$CONFIGURATION" ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
3434
fi
35+
- if [ $POD_LINT == "YES" ]; then
36+
pod lib lint --quick;
37+
fi
3538

3639
after_success:
3740
- if [ $RUN_TESTS == "YES" ]; then

Package.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "ValidationComponents",
5+
dependencies: [
6+
.Package(url: "https://github.com/nsagora/validation-kit.git", majorVersion: 0)
7+
],
8+
exclude: ["Tests"]
9+
)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)