Skip to content

Commit 4ff05c6

Browse files
committed
Run tests on Xcode8-beta
1 parent 492bd66 commit 4ff05c6

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
};
@@ -1167,8 +1171,11 @@
11671171
PRODUCT_NAME = SQLite;
11681172
SKIP_INSTALL = YES;
11691173
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1174+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
11701175
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
1176+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
11711177
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1178+
SWIFT_VERSION = 2.3;
11721179
};
11731180
name = Debug;
11741181
};
@@ -1189,7 +1196,10 @@
11891196
PRODUCT_NAME = SQLite;
11901197
SKIP_INSTALL = YES;
11911198
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1199+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
11921200
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
1201+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
1202+
SWIFT_VERSION = 2.3;
11931203
};
11941204
name = Release;
11951205
};
@@ -1200,6 +1210,7 @@
12001210
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12011211
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12021212
PRODUCT_NAME = "$(TARGET_NAME)";
1213+
SWIFT_VERSION = 2.3;
12031214
};
12041215
name = Debug;
12051216
};
@@ -1210,6 +1221,7 @@
12101221
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12111222
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12121223
PRODUCT_NAME = "$(TARGET_NAME)";
1224+
SWIFT_VERSION = 2.3;
12131225
};
12141226
name = Release;
12151227
};
@@ -1234,6 +1246,8 @@
12341246
SKIP_INSTALL = YES;
12351247
SWIFT_INCLUDE_PATHS = "";
12361248
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
1249+
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1250+
SWIFT_VERSION = 2.3;
12371251
};
12381252
name = Debug;
12391253
};
@@ -1258,6 +1272,8 @@
12581272
SKIP_INSTALL = YES;
12591273
SWIFT_INCLUDE_PATHS = "";
12601274
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
1275+
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1276+
SWIFT_VERSION = 2.3;
12611277
};
12621278
name = Release;
12631279
};
@@ -1272,6 +1288,7 @@
12721288
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12731289
PRODUCT_NAME = "$(TARGET_NAME)";
12741290
SDKROOT = macosx;
1291+
SWIFT_VERSION = 2.3;
12751292
};
12761293
name = Debug;
12771294
};
@@ -1286,6 +1303,7 @@
12861303
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12871304
PRODUCT_NAME = "$(TARGET_NAME)";
12881305
SDKROOT = macosx;
1306+
SWIFT_VERSION = 2.3;
12891307
};
12901308
name = Release;
12911309
};

0 commit comments

Comments
 (0)