Merge pull request #41 from sharplet/swift-2.3

Support Swift 2.3

.gitignore

@@ -1,7 +1,7 @@
 # Xcode
 build/
 .build/
-Carthage/Build/
+Carthage/
 xcuserdata/
 *.xccheckout
 *.xcscmblueprint

.travis.yml

@@ -1,6 +1,12 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode8
 install:
   - gem install xcpretty
-  - carthage bootstrap
-script: rake test build:all
+  - rake setup
+env:
+  - ACTION=test:osx
+  - ACTION=test:ios
+  - ACTION=test:tvos
+  - ACTION=test:watchos
+  - ACTION=build:all
+script: rake "$ACTION"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v3.0.0"
-github "Quick/Quick" "v0.8.0"
+github "Quick/Nimble" "v4.1.0"
+github "Quick/Quick" "v0.9.3"

Rakefile

@@ -2,7 +2,7 @@ require_relative "lib/suite_task"
 
 desc "Set up the project for development"
 task :setup do
-  sh "carthage bootstrap"
+  sh "carthage bootstrap --no-build"
 end
 
 namespace :build do
@@ -11,7 +11,7 @@ namespace :build do
 
   desc "Build and validate the podspec"
   task :pod do
-    sh "pod lib lint *.podspec --no-clean"
+    sh "pod lib lint *.podspec --quick --no-clean"
   end
 
   desc "Build the framework"
@@ -53,21 +53,26 @@ namespace :test do
 
   desc "Run tests on OS X"
   task :osx do
-    pretty "xcodebuild test -scheme Regex-OSX"
+    pretty "xcodebuild build-for-testing test-without-building -workspace Regex.xcworkspace -scheme Regex-OSX"
   end
 
   desc "Run tests on iOS Simulator"
   task :ios do
-    pretty "xcodebuild test -scheme Regex-iOS -destination 'platform=iOS Simulator,name=iPhone 6s'"
+    pretty "xcodebuild build-for-testing test-without-building -workspace Regex.xcworkspace -scheme Regex-iOS -destination 'platform=iOS Simulator,name=iPhone 6s'"
   end
 
   desc "Run tests on tvOS Simulator"
   task :tvos do
-    pretty "xcodebuild test -scheme Regex-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p'"
+    pretty "xcodebuild build-for-testing test-without-building -workspace Regex.xcworkspace -scheme Regex-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p'"
+  end
+
+  desc "Build for watchOS Simulator"
+  task :watchos do
+    pretty "xcodebuild build -workspace Regex.xcworkspace -scheme Regex-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'"
   end
 end
 
 desc "Run all tests"
-task :test => ["test:osx", "test:ios", "test:tvos"]
+task :test => ["test:osx", "test:ios", "test:tvos", "test:watchos"]
 
 task :default => :test

Regex.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>

STRegex.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = File.basename(__FILE__, ".podspec")
   s.version      = %x(git describe --tags --abbrev=0).chomp.sub(/^v/, '')
-  s.summary      = %x(curl -s https://api.github.com/repos/sharplet/Regex | ruby -rjson -e 'puts JSON.parse($stdin.read).fetch("description")').chomp
+  s.summary      = "A Swift µframework providing an NSRegularExpression-backed Regex type"
   s.homepage     = "https://github.com/sharplet/Regex"
   s.license      = "LICENSE.txt"
   s.author       = "Adam Sharp"