Merge pull request #18 from arturgrigor/master

Carthage support
yannickl · Aug 18, 2017 · b5d4494 · b5d4494
2 parents 7416485 + 1388ff6
commit b5d4494
Show file tree

Hide file tree

Showing 34 changed files with 1,173 additions and 2,193 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,13 @@
-# Xcode
+# Mac OS X
 .DS_Store
-*/build/*
+
+# Xcode
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,12 +17,26 @@
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
-profile
+
+## Other
+*.xccheckout
 *.moved-aside
-DerivedData
-.idea/
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
-*.xcworkspace
-*.xccheckout
-*.lock
-Example/Pods/*
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+.build/
+
+# Carthage
+Carthage/Build
+
+# CocoaPods
+Pods
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/PromiseKit"]
+	path = Carthage/Checkouts/PromiseKit
+	url = https://github.com/mxcl/PromiseKit.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,46 +1,37 @@
 language: objective-c
 osx_image: xcode8.3
-podfile: Example/Podfile
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
-    - WORKSPACE=Example/AwaitKit.xcworkspace
-    - IOS_FRAMEWORK_SCHEME="AwaitKit iOS"
-    - MACOS_FRAMEWORK_SCHEME="AwaitKit macOS"
-    - TVOS_FRAMEWORK_SCHEME="AwaitKit tvOS"
-    - WATCHOS_FRAMEWORK_SCHEME="AwaitKit watchOS"
+    - SCHEME="AwaitKit"
   matrix:
-    - SCHEME="$WATCHOS_FRAMEWORK_SCHEME" DESTINATION="OS=3.1,name=Apple Watch - 42mm" RUN_TESTS="NO"  POD_LINT="NO" RUN_CODECOV="NO"
-    - SCHEME="$WATCHOS_FRAMEWORK_SCHEME" DESTINATION="OS=2.0,name=Apple Watch - 42mm" RUN_TESTS="NO"  POD_LINT="NO" RUN_CODECOV="NO"
+    - DESTINATION="OS=3.1,name=Apple Watch - 42mm" RUN_TESTS="NO"  RUN_CODECOV="NO"
+    - DESTINATION="OS=2.0,name=Apple Watch - 42mm" RUN_TESTS="NO"  RUN_CODECOV="NO"
 
-    - SCHEME="$TVOS_FRAMEWORK_SCHEME"    DESTINATION="OS=10.0,name=Apple TV 1080p"    RUN_TESTS="YES" POD_LINT="NO" RUN_CODECOV="NO"
+    - DESTINATION="OS=10.0,name=Apple TV 1080p"    RUN_TESTS="YES" RUN_CODECOV="NO"
 
-    - SCHEME="$IOS_FRAMEWORK_SCHEME"     DESTINATION="OS=10.0,name=iPhone 6s"         RUN_TESTS="YES" POD_LINT="NO" RUN_CODECOV="YES"
-    - SCHEME="$IOS_FRAMEWORK_SCHEME"     DESTINATION="OS=9.0,name=iPad 2"             RUN_TESTS="YES" POD_LINT="NO" RUN_CODECOV="YES"
+    - DESTINATION="OS=10.0,name=iPhone 6s"         RUN_TESTS="YES" RUN_CODECOV="YES"
+    - DESTINATION="OS=9.0,name=iPad 2"             RUN_TESTS="YES" RUN_CODECOV="YES"
 
-    - SCHEME="$MACOS_FRAMEWORK_SCHEME"   DESTINATION="arch=x86_64,platform=macOS"     RUN_TESTS="YES" POD_LINT="NO" RUN_CODECOV="YES"
+    - DESTINATION="arch=x86_64,platform=macOS"     RUN_TESTS="YES" RUN_CODECOV="YES"
 script:
   - set -o pipefail
+  - git submodule update --init
   - xcodebuild -version
 
   # Build Framework in Debug and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
+      travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release GCC_GENERATE_TEST_COVERAGE_FILES=YES -enableCodeCoverage YES test | xcpretty;
     else
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
+      travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug build | xcpretty;
     fi
 
   # Build Framework in Release and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
+      travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release GCC_GENERATE_TEST_COVERAGE_FILES=YES -enableCodeCoverage YES test | xcpretty;
     else
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
-    fi
-
-  # Run `pod lib lint` if specified
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint;
+      travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
 after_success:
   # Run the `codecov` service if specified

diff --git a/AwaitKit.podspec b/AwaitKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AwaitKit'
-  s.version          = '3.0.1'
+  s.version          = '3.0.2'
   s.license          = 'MIT'
   s.summary          = 'The ES8 Async/Await control flow for Swift '
   s.homepage         = 'https://github.com/yannickl/AwaitKit.git'
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.ios.framework = 'Foundation'
 
-  s.dependency 'PromiseKit', '~> 4.2'
+  s.dependency 'PromiseKit', '~> 4.3'
 
   s.source_files = 'Sources/**/*.swift'
   s.requires_arc = true