Merge pull request stephencelis#568 from stephencelis/carthage-tests

Carthage tests

Author: jberkel

.gitignore

@@ -20,7 +20,7 @@ DerivedData
 *.xcuserstate
 
 # Carthage
-Carthage
+/Carthage/
 
 # Swift Package Manager
 .build

.travis.yml

@@ -12,9 +12,15 @@ matrix:
     - env: VALIDATOR_SUBSPEC="standard"
     - env: VALIDATOR_SUBSPEC="standalone"
     - env: VALIDATOR_SUBSPEC="SQLCipher"
+    - env: CARTHAGE_PLATFORM="iOS"
+    - env: CARTHAGE_PLATFORM="Mac"
+    - env: CARTHAGE_PLATFORM="watchOS"
+    - env: CARTHAGE_PLATFORM="tvOS"
     - env: PACKAGE_MANAGER_COMMAND="test -Xlinker -lsqlite3"
 before_install:
   - gem update bundler
   - gem install xcpretty --no-document
+  - brew update
+  - brew outdated carthage || brew upgrade carthage
 script:
   - ./run-tests.sh

Package.swift

@@ -12,5 +12,6 @@ let package = Package(
     ],
     dependencies: [
         .Package(url: "https://github.com/jberkel/CSQLite.git", majorVersion: 0)
-    ]
+    ],
+    exclude: ["Tests/CocoaPods", "Tests/Carthage"]
 )

Tests/Carthage/.gitignore

@@ -0,0 +1,3 @@
+Carthage/
+Cartfile
+Cartfile.resolved

Tests/Carthage/Makefile

@@ -0,0 +1,16 @@
+CARTHAGE := /usr/local/bin/carthage
+CARTHAGE_PLATFORM := iOS
+CARTHAGE_CONFIGURATION := Release
+CARTHAGE_DIR := Carthage
+CARTHAGE_ARGS := --no-use-binaries
+CARTHAGE_TOOLCHAIN := com.apple.dt.toolchain.Swift_3_0
+CARTHAGE_CMDLINE := --configuration $(CARTHAGE_CONFIGURATION) --platform $(CARTHAGE_PLATFORM) --toolchain $(CARTHAGE_TOOLCHAIN) $(CARTHAGE_ARGS)
+
+test: $(CARTHAGE) Cartfile
+	$< bootstrap $(CARTHAGE_CMDLINE)
+
+Cartfile:
+	echo 'git "$(TRAVIS_BUILD_DIR)" "HEAD"' > $@
+
+clean:
+	@rm -f Cartfile Cartfile.resolved

CocoaPodsTests/.gitignore renamed to Tests/CocoaPods/.gitignore

@@ -34,10 +34,10 @@ def validator
   end
 
   def podspec
-    File.expand_path(File.dirname(__FILE__) + '/../SQLite.swift.podspec')
+    File.expand_path(File.dirname(__FILE__) + '/../../SQLite.swift.podspec')
   end
 
   def project_test_dir
-    File.expand_path(File.dirname(__FILE__) + '/../Tests/SQLiteTests')
+    File.expand_path(File.dirname(__FILE__) + '/../SQLiteTests')
   end
 end