Skip to content

Commit e659636

Browse files
committed
Run tests on Xcode8-beta
1 parent abab39b commit e659636

File tree

6 files changed

+38
-1
lines changed

6 files changed

+38
-1
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
language: objective-c
22
matrix:
3+
34
include:
5+
- os: osx
6+
osx_image: xcode8
7+
env: BUILD_SCHEME="SQLite iOS"
8+
- os: osx
9+
osx_image: xcode8
10+
env: BUILD_SCHEME="SQLite Mac"
411
- env: BUILD_SCHEME="SQLite iOS"
512
- env: BUILD_SCHEME="SQLite Mac"
613
- env: VALIDATOR_SUBSPEC="none"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/usr/include/sqlite3.h"
3+
export *
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator10.0.sdk/usr/include/sqlite3.h"
3+
export *
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
33
ifeq ($(BUILD_SCHEME),SQLite iOS)
4-
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -sdk iphonesimulator
4+
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=iPhone 6"
55
else
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)"
77
endif

SQLite.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,15 +686,19 @@
686686
};
687687
EE247AD21C3F04ED00AE3E12 = {
688688
CreatedOnToolsVersion = 7.2;
689+
LastSwiftMigration = 0800;
689690
};
690691
EE247ADC1C3F04ED00AE3E12 = {
691692
CreatedOnToolsVersion = 7.2;
693+
LastSwiftMigration = 0800;
692694
};
693695
EE247B3B1C3F3ED000AE3E12 = {
694696
CreatedOnToolsVersion = 7.2;
697+
LastSwiftMigration = 0800;
695698
};
696699
EE247B441C3F3ED000AE3E12 = {
697700
CreatedOnToolsVersion = 7.2;
701+
LastSwiftMigration = 0800;
698702
};
699703
};
700704
};
@@ -1165,8 +1169,11 @@
11651169
PRODUCT_NAME = SQLite;
11661170
SKIP_INSTALL = YES;
11671171
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1172+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
11681173
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
1174+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
11691175
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1176+
SWIFT_VERSION = 2.3;
11701177
};
11711178
name = Debug;
11721179
};
@@ -1187,7 +1194,10 @@
11871194
PRODUCT_NAME = SQLite;
11881195
SKIP_INSTALL = YES;
11891196
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1197+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
11901198
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
1199+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
1200+
SWIFT_VERSION = 2.3;
11911201
};
11921202
name = Release;
11931203
};
@@ -1198,6 +1208,7 @@
11981208
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11991209
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12001210
PRODUCT_NAME = "$(TARGET_NAME)";
1211+
SWIFT_VERSION = 2.3;
12011212
};
12021213
name = Debug;
12031214
};
@@ -1208,6 +1219,7 @@
12081219
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12091220
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12101221
PRODUCT_NAME = "$(TARGET_NAME)";
1222+
SWIFT_VERSION = 2.3;
12111223
};
12121224
name = Release;
12131225
};
@@ -1232,6 +1244,8 @@
12321244
SKIP_INSTALL = YES;
12331245
SWIFT_INCLUDE_PATHS = "";
12341246
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
1247+
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1248+
SWIFT_VERSION = 2.3;
12351249
};
12361250
name = Debug;
12371251
};
@@ -1256,6 +1270,8 @@
12561270
SKIP_INSTALL = YES;
12571271
SWIFT_INCLUDE_PATHS = "";
12581272
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
1273+
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1274+
SWIFT_VERSION = 2.3;
12591275
};
12601276
name = Release;
12611277
};
@@ -1270,6 +1286,7 @@
12701286
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12711287
PRODUCT_NAME = "$(TARGET_NAME)";
12721288
SDKROOT = macosx;
1289+
SWIFT_VERSION = 2.3;
12731290
};
12741291
name = Debug;
12751292
};
@@ -1284,6 +1301,7 @@
12841301
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12851302
PRODUCT_NAME = "$(TARGET_NAME)";
12861303
SDKROOT = macosx;
1304+
SWIFT_VERSION = 2.3;
12871305
};
12881306
name = Release;
12891307
};

0 commit comments

Comments
 (0)