Swift4toolchain

.circleci/config.yml

@@ -0,0 +1,10 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/swift-mysql
+    docker:
+      - image: ibmcom/swift-ubuntu:4.0
+    steps:
+      - checkout
+      - run: apt-get update && apt-get install -y libmysqlclient-dev
+      - run: make test_unit

Makefile

@@ -1,23 +1,41 @@
-ifeq "$(PLATFORM)" ""
-PLATFORM := $(shell uname)
-endif
-
-ifeq "$(PLATFORM)" "Darwin"
-BUILDCOMMAND := swift build -Xcc -fblocks -Xswiftc -I/usr/local/include -Xlinker -L/usr/local/lib
-REPLACECOMMAND := ls > /dev/null
-else
-BUILDCOMMAND := swift build -Xcc -fblocks
-REPLACECOMMAND := sed -i -e 's/MySQL.xctest/MySQLTest.xctest/g' .build/debug.yaml
-endif
-
-build: clean
+TEST_COMMAND = swift test -Xlinker -L/usr/local/lib
+
+build:
 	@echo --- Building package
-	$(BUILDCOMMAND)
-test: clean build
+	swift build -Xlinker -L/usr/local/lib
+
+test_unit: build
 	@echo --- Running tests
-	$(REPLACECOMMAND)
-	swift test
+
+	$(TEST_COMMAND) --filter MySQLTests
+
+test_one: build
+	swift test -Xlinker -L/usr/local/lib --filter ${TEST}
+
+test_integration: build
+	@echo --- Running integration tests
+
+	docker run --name mysqlswift \
+	-e MYSQL_ROOT_PASSWORD=my-secret-pw \
+	-d \
+	-p 3306:3306 mysql
+
+	sleep 15
+
+	trap '$(TEST_COMMAND) --filter IntegrationTests' EXIT
+
+	docker stop mysqlswift
+	docker rm -v mysqlswift
+
+swiftdocs:
+	jazzy \
+  --clean \
+  --author Nic Jackson \
+  --author_url https://nicholasjackson.io \
+  --github_url https://github.com/nicholasjackson/swift-mysql \
+  --module MySQL \
+  --output docs/ \
 
 clean:
-	@echo --- Invoking swift build --clean
-	swift build --clean
+	@echo --- Clean build folder
+	rm -rf .build

MySQL.xcodeproj/IntegrationTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

MySQL.xcodeproj/MySQLTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

MySQL.xcodeproj/MySQL_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>