Skip to content

Commit 9564b83

Browse files
kylefkylef
committed
Merge pull request kylef#21 from tternes/carthage-support
Add Carthage Support
2 parents 6df50e2 + 042be77 commit 9564b83

File tree

10 files changed

+121
-143
lines changed

10 files changed

+121
-143
lines changed

‎.gitignore

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

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/CryptoSwift"]
2+
path = Carthage/Checkouts/CryptoSwift
3+
url = https://github.com/krzyzanowskim/CryptoSwift.git

‎.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ before_install:
55
- gem install xcpretty --no-document
66
script:
77
- set -o pipefail
8-
- xcodebuild -workspace JWT.xcworkspace -scheme JWT test -sdk macosx | xcpretty -c
9-
- pod lib lint
8+
- git submodule update --init --recursive
9+
- xcodebuild -project JWT.xcodeproj -scheme JWT test -sdk macosx | xcpretty -c
10+
- pod lib lint --no-clean

‎Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "krzyzanowskim/CryptoSwift" "0.2.2"

‎Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "krzyzanowskim/CryptoSwift" "0.2.2"

‎Carthage/Checkouts/CryptoSwift

Submodule CryptoSwift added at 14e726d

‎JWT.xcodeproj/project.pbxproj

Lines changed: 111 additions & 110 deletions
Large diffs are not rendered by default.

‎JWT.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Podfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Podfile.lock

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)