Switched to Cocoapods

robb · Sep 13, 2016 · e6a56c3 · e6a56c3
1 parent 3f127c2
commit e6a56c3
Show file tree

Hide file tree

Showing 9 changed files with 250 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,4 @@ DerivedData
 *.ipa
 *.xcuserstate
 
-Carthage/
+Pods/
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,10 @@
 language: objective-c
 osx_image: xcode8
-before_install:
-- brew update
-- brew install carthage || brew outdated carthage || brew upgrade carthage
 install:
 - gem install xcpretty
-- carthage bootstrap --platform "ios osx"
+- gem install cocoapods --pre
 script:
+- pod update
 - set -o pipefail && xcodebuild -scheme 'Cartography-Mac' test | xcpretty -c
 - set -o pipefail && xcodebuild -scheme 'Cartography-iOS' -sdk iphonesimulator test | xcpretty -c
 env:

diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Cartography.xcodeproj/project.pbxproj b/Cartography.xcodeproj/project.pbxproj
diff --git a/Cartography.xcworkspace/contents.xcworkspacedata b/Cartography.xcworkspace/contents.xcworkspacedata
diff --git a/CartographyTests/PrioritySpec.swift b/CartographyTests/PrioritySpec.swift
@@ -16,9 +16,9 @@ class PrioritySpec: QuickSpec {
         }
 
         it("should operate on a single constraint") {
-            var constraint: NSLayoutConstraint!
+            var constraint: NSLayoutConstraint
 
-            constrain(view) { view in
+            constrain(view) { (view: LayoutProxy) -> Void in
                 constraint = (view.width == 200 ~ 100)
             }
 

diff --git a/Podfile b/Podfile
@@ -0,0 +1,20 @@
+platform :ios, '8.0'
+
+def testing_pods
+    use_frameworks!
+    pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git'
+    pod 'Quick', :git => 'https://github.com/Quick/Quick.git', :branch => 'swift-3.0'
+end
+
+target 'Cartography-iOS-Tests' do
+    testing_pods
+end
+
+target 'Cartography-Mac-Tests' do
+    testing_pods
+end
+
+target 'Cartography-tvOS-tests' do
+    testing_pods
+end
+
diff --git a/Podfile.lock b/Podfile.lock
@@ -0,0 +1,30 @@
+PODS:
+  - Nimble (5.0.0-alpha.30p1)
+  - Quick (0.9.3)
+
+DEPENDENCIES:
+  - Nimble (from `https://github.com/Quick/Nimble.git`)
+  - Quick (from `https://github.com/Quick/Quick.git`, branch `swift-3.0`)
+
+EXTERNAL SOURCES:
+  Nimble:
+    :git: https://github.com/Quick/Nimble.git
+  Quick:
+    :branch: swift-3.0
+    :git: https://github.com/Quick/Quick.git
+
+CHECKOUT OPTIONS:
+  Nimble:
+    :commit: fcc28b23f57b30382e5f182c238674694d7174cb
+    :git: https://github.com/Quick/Nimble.git
+  Quick:
+    :commit: 8f2bc636ecfa2cc20696f62548b38d4ab943e299
+    :git: https://github.com/Quick/Quick.git
+
+SPEC CHECKSUMS:
+  Nimble: c5b995b4cd57789ec44b0cfb79640fc00e61a8c7
+  Quick: 31fb576b6cbb6b028cc5e0016e4366accbb346f5
+
+PODFILE CHECKSUM: 94e62a1cbb74d497712b7925a67bd347a615d4e5
+
+COCOAPODS: 1.1.0.beta.1