Skip to content

Commit 6b0508b

Browse files
committed
Merge pull request #19 from auth0/feature-carthage-support
Carthage support
2 parents 40b2e37 + fed49a9 commit 6b0508b

File tree

63 files changed

+1496
-3030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1496
-3030
lines changed

.gitmodules

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

.travis.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
language: objective-c
2-
31
reference: http://www.objc.io/issue-6/travis-ci.html
4-
52
language: objective-c
6-
7-
podfile: Examples/iOS/Podfile
8-
9-
before_install:
10-
- brew update
11-
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
12-
- gem install cocoapods --no-ri --no-rdoc
13-
14-
script:
15-
- xctool -workspace Examples/iOS/A0SimpleKeychain.xcworkspace -scheme A0SimpleKeychain -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO clean test
16-
3+
osx_image: xcode6.4
4+
before_install: true
5+
install: true
6+
git:
7+
submodules: false
8+
script: script/cibuild
179
notifications:
1810
slack:
1911
secure: AXLozZlImcdopg/+srq4wcC4SVGMmoDJDXR1PKrH+Dc7DtnYXLCOKKk8hAXySIiHGR4820CX1SZ25By1Q6l8GIomHMfbYwdPILG61KHbIMydBIeoLUNRlM+VK6ao5uFt0Fj6ByNYMQweUuXDAHli88mHwE1aJmL7K3unn11L0lU=
20-
2112
branches:
2213
only:
2314
- master

Cartfile.private

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "specta/specta" ~> 0.5
2+
github "specta/expecta" ~> 1.0

Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "specta/expecta" "v1.0.2"
2+
github "specta/specta" "v0.5.0"

Carthage/Checkouts/expecta

Submodule expecta added at 15025d0

Carthage/Checkouts/specta

Submodule specta added at e9de856

Examples/OSX/A0SimpleKeychainOSX.xcodeproj/project.pbxproj

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

Examples/OSX/A0SimpleKeychainOSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

Examples/OSX/A0SimpleKeychainOSX.xcworkspace/contents.xcworkspacedata

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

Examples/OSX/A0SimpleKeychainOSX/AppDelegate.h

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

0 commit comments

Comments
 (0)