Skip to content

Commit ffe8cc9

Browse files
committed
Merged swift2.3
2 parents c3a757b + cc9d02f commit ffe8cc9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: objective-c
2-
env: SWIFT_VERSION=3.0
3-
osx_image: xcode8.0
4-
xcode_project: KRProgressHUD.xcodeproj
5-
xcode_scheme: KRProgressHUD
6-
xcode_sdk: iphonesimulator
2+
osx_image: xcode8
3+
script:
4+
- xcodebuild clean test -project KRProgressHUD.xcodeproj -scheme KRProgressHUD -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0'
5+

KRProgressHUD.xcodeproj/project.pbxproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
290290
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
291291
PRODUCT_NAME = "$(TARGET_NAME)";
292-
SWIFT_VERSION = 2.3;
292+
SWIFT_VERSION = 3.0;
293293
TEST_HOST = "";
294294
};
295295
name = Debug;
@@ -303,7 +303,7 @@
303303
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
304304
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
305305
PRODUCT_NAME = "$(TARGET_NAME)";
306-
SWIFT_VERSION = 2.3;
306+
SWIFT_VERSION = 3.0;
307307
TEST_HOST = "";
308308
};
309309
name = Release;
@@ -353,7 +353,7 @@
353353
ONLY_ACTIVE_ARCH = YES;
354354
SDKROOT = iphoneos;
355355
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
356-
SWIFT_VERSION = 2.3;
356+
SWIFT_VERSION = 3.0;
357357
TARGETED_DEVICE_FAMILY = "1,2";
358358
VERSIONING_SYSTEM = "apple-generic";
359359
VERSION_INFO_PREFIX = "";
@@ -398,6 +398,7 @@
398398
MTL_ENABLE_DEBUG_INFO = NO;
399399
SDKROOT = iphoneos;
400400
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
401+
SWIFT_VERSION = 3.0;
401402
TARGETED_DEVICE_FAMILY = "1,2";
402403
VALIDATE_PRODUCT = YES;
403404
VERSIONING_SYSTEM = "apple-generic";

KRProgressHUDTests/KRProgressHUDTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class KRProgressHUDTests: XCTestCase {
2727

2828
func testPerformanceExample() {
2929
// This is an example of a performance test case.
30-
self.measureBlock {
30+
self.measure {
3131
// Put the code you want to measure the time of here.
3232
}
3333
}

0 commit comments

Comments
 (0)