Carthage support

.gitignore

@@ -1,6 +1,13 @@
-# Xcode
+# Mac OS X
 .DS_Store
+
+# Xcode
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -9,13 +16,24 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
 xcuserdata
-profile
+
+## Other
+*.xccheckout
 *.moved-aside
-DerivedData
-.idea/
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+.build/
 
-Pods
-TransitionKit.xcodeproj/xcshareddata/xcschemes
+# Carthage
+Carthage/Build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/Kiwi"]
+	path = Carthage/Checkouts/Kiwi
+	url = https://github.com/kiwi-bdd/Kiwi.git

.travis.yml

@@ -1,4 +1,29 @@
 language: objective-c
-before_install:
-    - gem install cocoapods
-script: bundle exec rake spec
+osx_image: xcode8.2
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  - WORKSPACE=TransitionKit.xcworkspace
+  - IOS_FRAMEWORK_SCHEME="TransitionKit iOS"
+  - MACOS_FRAMEWORK_SCHEME="TransitionKit macOS"
+  - secure: GJxuge6KjDfMUa12T6dhCmfDrOKt/QQy00uUHtAfNakQM7+FOJsk46c120GZDHcjtsjme0tgTV4JYEvASMtt/05qvo+GewCXYcPm9a/lfDJHpMa4liFiy8jb5RKkcBPJ5WQXspDuRtS84tm8hdAwWWPvj9Jh2wgYEAy8Id19PPN0CQQiAg7qRtmwgsSDNXxatrSkMffpZyG4z6xBY5o1P/NR4nWs/8zvyMtojPdJU10kNWoklxyfyTyUoBI+3TFd8c+oLfW+Fxf9YpcQNq7dlek0p/cvR05UqBQEfGuEOOxzpreVScCBP6pQqMtvDJmhquyGNVdjLzCwWzbK1bkeNzk4/dapLSIsmINMa+NlxfnjrbagbxOV0ZuN0QVPdixB8XVMAk0fQTAovakrzBVv6BWmG9KN8nKvz5OBYRIWnlgvdsTFxFiFncuGYhg7dDi/STtAedMLzMAbXTHErtEgXLyp3kNMUhjNF4dBjkD4JZf1lyTFEN3EufMmJOkqUZ9i8u2bc0WmxjgjXcxzGJgP9C3ZBYJ/xz7n+FuZtwats2RGjMXHGnu677yjzxl0+dHEwRcNd2jisiZqQyl2xI9/7p072QhHwpgwZWmRCPXd3iLjgv1463bPCtohsdSI8RJxFXpN0wFkk/EXGTXyoU3oQWJrM3J+3QtOqNPfJ3uaVq4=
+  matrix:
+  - DESTINATION="OS=10.0,name=iPhone 6s Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES"
+  - DESTINATION="OS=9.0,name=iPad 2"             SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES"
+  - DESTINATION="arch=x86_64"                    SCHEME="$MACOS_FRAMEWORK_SCHEME"   RUN_TESTS="YES"
+script:
+- set -o pipefail
+- git submodule update --init
+- xcodebuild -version
+
+- if [ $RUN_TESTS == "YES" ]; then travis_retry xcodebuild -workspace "$WORKSPACE"
+  -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO
+  ENABLE_TESTABILITY=YES test; else travis_retry xcodebuild -workspace "$WORKSPACE"
+  -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO
+  build; fi
+- if [ $RUN_TESTS == "YES" ]; then travis_retry xcodebuild -workspace "$WORKSPACE"
+  -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO
+  ENABLE_TESTABILITY=YES test; else travis_retry xcodebuild -workspace "$WORKSPACE"
+  -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO
+  build; fi

Cartfile.private

@@ -0,0 +1 @@
+github "kiwi-bdd/Kiwi"

Cartfile.resolved

@@ -0,0 +1 @@
+github "kiwi-bdd/Kiwi" "v2.4.0"

Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

README.md

@@ -1,7 +1,8 @@
 TransitionKit
 =============
 
-[![Build Status](https://travis-ci.org/blakewatters/TransitionKit.png?branch=master,development)](https://travis-ci.org/blakewatters/TransitionKit) 
+[![Build Status](https://travis-ci.org/blakewatters/TransitionKit.png?branch=master,development)](https://travis-ci.org/blakewatters/TransitionKit)
+[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 ![Pod Version](https://cocoapod-badges.herokuapp.com/v/TransitionKit/badge.png) 
 ![Pod Platform](https://cocoapod-badges.herokuapp.com/p/TransitionKit/badge.png)
 

Specs/TransitionKitTests-Info.plist → Specs/Info.plist

@@ -5,17 +5,17 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.blakewatters.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Specs/TKEventSpec.m

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import "Kiwi.h"
+#import <Kiwi/Kiwi.h>
 #import "TKEvent.h"
 
 SPEC_BEGIN(TKEventSpec)

Specs/TKStateMachineSpec.m

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import "Kiwi.h"
+#import <Kiwi/Kiwi.h>
 #import "TransitionKit.h"
 
 @interface TKSpecPerson : NSObject

Specs/TKStateSpec.m

@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import "Kiwi.h"
+#import <Kiwi/Kiwi.h>
 #import "TKState.h"
 
 SPEC_BEGIN(TKStateSpec)

TransitionKit.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name     = 'TransitionKit'
-  s.version  = '2.2.1'
+  s.version  = '2.2.4'
   s.license  = 'Apache2'
   s.summary  = 'A block-based State Machine API for Objective-C.'
   s.homepage = 'https://github.com/blakewatters/TransitionKit'
   s.authors  = { 'Blake Watters' => '[email protected]' }
   s.source   = { :git => 'https://github.com/blakewatters/TransitionKit.git', :tag => s.version.to_s }
   s.source_files = 'Code'
   s.requires_arc = true
-  s.ios.deployment_target = '5.0'
+  s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.7'
 end