Skip to content

Commit 693baa1

Browse files
committed
Update for Xcode9 and Swift4
1 parent beb80e6 commit 693baa1

File tree

11 files changed

+69
-52
lines changed

11 files changed

+69
-52
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: objective-c
2-
osx_image: xcode8.3
2+
osx_image: xcode9
3+
xcode_sdk: iphonesimulator10.3
34
install:
45
- gem install xcpretty
56
- carthage bootstrap
67
script:
7-
- set -o pipefail && travis_retry xcodebuild -project KRProgressHUD.xcodeproj -scheme
8-
KRProgressHUD -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone
9-
7,OS=10.1' test | xcpretty
8+
- set -o pipefail
9+
- travis_retry xcodebuild -project KRProgressHUD.xcodeproj -scheme KRProgressHUD -destination "platform=iOS Simulator,name=iPhone 7" build-for-testing test | xcpretty
1010
env:
1111
global:
1212
secure: H2F4FRck9DrekGj3GVscqwrK+Sf53UZeENw59GPXXIL3drotK0xn1sOS6kUe3vq+zOOa3s8QRixMB0XfEsu2lALz5/QA7rdaRQTIgybDs7bPUuJte4l/CIBY0c56vIUIIYTRSd2kjeCQp0xWWn9mhK5sHYDkDLMxINEx78+coEuwp0tOhPRrVczhtbTCfdi8CZI94RwxHHem1H7FNCvl7tPBh4hIxIryCFoXkodGYMfYbJ1td6HXvQFU8qIS7IHta63jEbZPXLOHUC4o4bFNtgtj9n6Qh/lb5DrWvSdmCwxebaiXEMQ0chyev17X2koIzqpTo7zgSFEZWaqKj+WpAHUeUEcWlc0P7fMRTE/jOhSm4YnuMXSWRbFPWy//Jl07dZAZaZY9Yf6nQ4j4r3rzQubfrm336ofWv4RTdsQ2JuNUX9NHB2829ctj2hEsMjJfh6r7rnkzZt7VgG7vRQTKU/U/kwfW2NQmOwZNu2zSBXQArIGu6fE6WmwZcZbVA9fZF7l40do71KFywYgECBnWkmt6xEpdeH6Me6BI9tG5I5em1Do3x+UBQmPvilPe2r+vOqcZdBRL3zu7sQXgiBeeE3pqttxcV/QYQjZfQrZTaBbjke/Ov+fHdKZ+vyzIy82gGnsU0zhK7iYaDhtV6PW3E9lMFOY1AEI61mEy7untJQU=

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "krimpedance/KRActivityIndicatorView" ~> 2.0.0
1+
github "krimpedance/KRActivityIndicatorView" ~> 2.1.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "krimpedance/KRActivityIndicatorView" "2.0.2"
1+
github "krimpedance/KRActivityIndicatorView" "2.1.0"

DEMO/KRProgressHUDDemo.xcodeproj/project.pbxproj

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
isa = PBXProject;
161161
attributes = {
162162
LastSwiftUpdateCheck = 0720;
163-
LastUpgradeCheck = 0800;
163+
LastUpgradeCheck = 0900;
164164
ORGANIZATIONNAME = Krimpedance;
165165
TargetAttributes = {
166166
4BF8F8041C6D3982008F07F0 = {
@@ -288,14 +288,20 @@
288288
CLANG_CXX_LIBRARY = "libc++";
289289
CLANG_ENABLE_MODULES = YES;
290290
CLANG_ENABLE_OBJC_ARC = YES;
291+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
291292
CLANG_WARN_BOOL_CONVERSION = YES;
293+
CLANG_WARN_COMMA = YES;
292294
CLANG_WARN_CONSTANT_CONVERSION = YES;
293295
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
294296
CLANG_WARN_EMPTY_BODY = YES;
295297
CLANG_WARN_ENUM_CONVERSION = YES;
296298
CLANG_WARN_INFINITE_RECURSION = YES;
297299
CLANG_WARN_INT_CONVERSION = YES;
300+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
301+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
298302
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
303+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
304+
CLANG_WARN_STRICT_PROTOTYPES = YES;
299305
CLANG_WARN_SUSPICIOUS_MOVE = YES;
300306
CLANG_WARN_UNREACHABLE_CODE = YES;
301307
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -318,11 +324,12 @@
318324
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
319325
GCC_WARN_UNUSED_FUNCTION = YES;
320326
GCC_WARN_UNUSED_VARIABLE = YES;
321-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
327+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
322328
MTL_ENABLE_DEBUG_INFO = YES;
323329
ONLY_ACTIVE_ARCH = YES;
324330
SDKROOT = iphoneos;
325331
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
332+
SWIFT_VERSION = 4.0;
326333
};
327334
name = Debug;
328335
};
@@ -334,14 +341,20 @@
334341
CLANG_CXX_LIBRARY = "libc++";
335342
CLANG_ENABLE_MODULES = YES;
336343
CLANG_ENABLE_OBJC_ARC = YES;
344+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
337345
CLANG_WARN_BOOL_CONVERSION = YES;
346+
CLANG_WARN_COMMA = YES;
338347
CLANG_WARN_CONSTANT_CONVERSION = YES;
339348
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
340349
CLANG_WARN_EMPTY_BODY = YES;
341350
CLANG_WARN_ENUM_CONVERSION = YES;
342351
CLANG_WARN_INFINITE_RECURSION = YES;
343352
CLANG_WARN_INT_CONVERSION = YES;
353+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
354+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
344355
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
356+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
357+
CLANG_WARN_STRICT_PROTOTYPES = YES;
345358
CLANG_WARN_SUSPICIOUS_MOVE = YES;
346359
CLANG_WARN_UNREACHABLE_CODE = YES;
347360
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -358,10 +371,11 @@
358371
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
359372
GCC_WARN_UNUSED_FUNCTION = YES;
360373
GCC_WARN_UNUSED_VARIABLE = YES;
361-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
374+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
362375
MTL_ENABLE_DEBUG_INFO = NO;
363376
SDKROOT = iphoneos;
364377
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
378+
SWIFT_VERSION = 4.0;
365379
VALIDATE_PRODUCT = YES;
366380
};
367381
name = Release;
@@ -377,12 +391,12 @@
377391
"$(PROJECT_DIR)/../Carthage/Build/iOS",
378392
);
379393
INFOPLIST_FILE = KRProgressHUDDemo/Info.plist;
380-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
394+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
381395
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
382396
LIBRARY_SEARCH_PATHS = "";
383397
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDDemo;
384398
PRODUCT_NAME = "$(TARGET_NAME)";
385-
SWIFT_VERSION = 3.0;
399+
SWIFT_VERSION = 4.0;
386400
};
387401
name = Debug;
388402
};
@@ -397,12 +411,12 @@
397411
"$(PROJECT_DIR)/../Carthage/Build/iOS",
398412
);
399413
INFOPLIST_FILE = KRProgressHUDDemo/Info.plist;
400-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
414+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
401415
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
402416
LIBRARY_SEARCH_PATHS = "";
403417
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDDemo;
404418
PRODUCT_NAME = "$(TARGET_NAME)";
405-
SWIFT_VERSION = 3.0;
419+
SWIFT_VERSION = 4.0;
406420
};
407421
name = Release;
408422
};

KRProgressHUD.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Pod::Spec.new do |s|
22
s.name = "KRProgressHUD"
3-
s.version = "3.0.0"
3+
s.version = "3.1.0"
44
s.summary = "A beautiful progress HUD for your iOS."
55
s.description = "KRProgressHUD is a beautiful and easy-to-use HUD meant to display the progress on iOS."
66
s.homepage = "https://github.com/krimpedance/KRProgressHUD"
77
s.license = { :type => "MIT", :file => "LICENSE" }
88

99
s.author = { "krimpedance" => "krimpedance@gmail.com" }
1010
s.requires_arc = true
11-
s.platform = :ios, '9.0'
12-
s.ios.deployment_target = '9.0'
11+
s.platform = :ios, '10.0'
12+
s.ios.deployment_target = '10.0'
1313

1414
s.source = { :git => "https://github.com/krimpedance/KRProgressHUD.git", :tag => s.version.to_s }
1515
s.source_files = "KRProgressHUD/**/*.swift"
1616

17-
s.dependency "KRActivityIndicatorView", "~> 2.0.2"
17+
s.dependency "KRActivityIndicatorView", "~> 2.1.0"
1818
end

KRProgressHUD.xcodeproj/project.pbxproj

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
4BA70C2F1D02F28D009EB743 = {
191191
CreatedOnToolsVersion = 7.3.1;
192192
LastSwiftMigration = 0800;
193+
ProvisioningStyle = Automatic;
193194
};
194195
};
195196
};
@@ -285,12 +286,12 @@
285286
"$(PROJECT_DIR)/Carthage/Build/iOS",
286287
);
287288
INFOPLIST_FILE = KRProgressHUDTests/Info.plist;
288-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
289+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
289290
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
290291
ONLY_ACTIVE_ARCH = NO;
291292
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
292293
PRODUCT_NAME = "$(TARGET_NAME)";
293-
SWIFT_VERSION = 3.0;
294+
SWIFT_VERSION = 4.0;
294295
TEST_HOST = "";
295296
};
296297
name = Debug;
@@ -304,11 +305,11 @@
304305
"$(PROJECT_DIR)/Carthage/Build/iOS",
305306
);
306307
INFOPLIST_FILE = KRProgressHUDTests/Info.plist;
307-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
308+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
308309
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
309310
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
310311
PRODUCT_NAME = "$(TARGET_NAME)";
311-
SWIFT_VERSION = 3.0;
312+
SWIFT_VERSION = 4.0;
312313
TEST_HOST = "";
313314
};
314315
name = Release;
@@ -353,12 +354,12 @@
353354
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
354355
GCC_WARN_UNUSED_FUNCTION = YES;
355356
GCC_WARN_UNUSED_VARIABLE = YES;
356-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
357+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
357358
MTL_ENABLE_DEBUG_INFO = YES;
358359
ONLY_ACTIVE_ARCH = YES;
359360
SDKROOT = iphoneos;
360361
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
361-
SWIFT_VERSION = 3.0;
362+
SWIFT_VERSION = 4.0;
362363
TARGETED_DEVICE_FAMILY = "1,2";
363364
VERSIONING_SYSTEM = "apple-generic";
364365
VERSION_INFO_PREFIX = "";
@@ -399,11 +400,11 @@
399400
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
400401
GCC_WARN_UNUSED_FUNCTION = YES;
401402
GCC_WARN_UNUSED_VARIABLE = YES;
402-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
403+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
403404
MTL_ENABLE_DEBUG_INFO = NO;
404405
SDKROOT = iphoneos;
405406
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
406-
SWIFT_VERSION = 3.0;
407+
SWIFT_VERSION = 4.0;
407408
TARGETED_DEVICE_FAMILY = "1,2";
408409
VALIDATE_PRODUCT = YES;
409410
VERSIONING_SYSTEM = "apple-generic";
@@ -415,8 +416,10 @@
415416
isa = XCBuildConfiguration;
416417
buildSettings = {
417418
APPLICATION_EXTENSION_API_ONLY = NO;
418-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
419+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
420+
CODE_SIGN_STYLE = Automatic;
419421
DEFINES_MODULE = YES;
422+
DEVELOPMENT_TEAM = "";
420423
DYLIB_COMPATIBILITY_VERSION = 1;
421424
DYLIB_CURRENT_VERSION = 1;
422425
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -426,22 +429,25 @@
426429
);
427430
INFOPLIST_FILE = KRProgressHUD/Info.plist;
428431
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
429-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
432+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
430433
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
431434
ONLY_ACTIVE_ARCH = NO;
432435
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUD;
433436
PRODUCT_NAME = "$(TARGET_NAME)";
437+
PROVISIONING_PROFILE_SPECIFIER = "";
434438
SKIP_INSTALL = YES;
435-
SWIFT_VERSION = 3.0;
439+
SWIFT_VERSION = 4.0;
436440
};
437441
name = Debug;
438442
};
439443
4BA70C3A1D02F28D009EB743 /* Release */ = {
440444
isa = XCBuildConfiguration;
441445
buildSettings = {
442446
APPLICATION_EXTENSION_API_ONLY = NO;
443-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
447+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
448+
CODE_SIGN_STYLE = Automatic;
444449
DEFINES_MODULE = YES;
450+
DEVELOPMENT_TEAM = "";
445451
DYLIB_COMPATIBILITY_VERSION = 1;
446452
DYLIB_CURRENT_VERSION = 1;
447453
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -451,12 +457,13 @@
451457
);
452458
INFOPLIST_FILE = KRProgressHUD/Info.plist;
453459
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
454-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
460+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
455461
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
456462
PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUD;
457463
PRODUCT_NAME = "$(TARGET_NAME)";
464+
PROVISIONING_PROFILE_SPECIFIER = "";
458465
SKIP_INSTALL = YES;
459-
SWIFT_VERSION = 3.0;
466+
SWIFT_VERSION = 4.0;
460467
};
461468
name = Release;
462469
};

KRProgressHUD.xcodeproj/xcshareddata/xcschemes/KRProgressHUD.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

KRProgressHUD/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.0.0</string>
18+
<string>3.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

README.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
- Indicator color can be customized
2222

2323
## Requirements
24-
- iOS 9.0+
25-
- Xcode 8.0+
26-
- Swift 3.0+
24+
- iOS 10.0+
25+
- Xcode 9.0+
26+
- Swift 4.0+
2727

2828
## DEMO
2929
To run the example project, clone the repo, and open `KRProgressHUDDemo.xcodeproj` from the DEMO directory.
@@ -175,16 +175,13 @@ These `set()` setting can be reset by
175175
I'm seeking bug reports and feature requests.
176176

177177
## Release Note
178+
+ 3.1.0 :
179+
- Available at CocoaPods and Carthage with Xcode9 and Swift4.
180+
178181
+ 3.0.0 :
179182
- [ADD] Set styles with method chaining.
180183
- [ADD] Show HUD on VC.
181184

182-
+ 2.2.2 :
183-
- [MODIFY] `M_PI` to `Double.pi`
184-
185-
+ 2.2.1 :
186-
- [BUGFIX] Bug of message label's position after calling `showText()`
187-
188185
## License
189186
KRProgressHUD is available under the MIT license.
190187

0 commit comments

Comments
 (0)