Update for Swift 5

krimpedance · krimpedance · commit c0228b6de20b · 2019-05-01T16:32:24.000+09:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,11 @@
 language: objective-c
-osx_image: xcode10
-xcode_sdk: iphonesimulator12.0
+osx_image: xcode10.2
+xcode_sdk: iphonesimulator12.2
 install:
 - gem install xcpretty
-- carthage bootstrap
+- carthage bootstrap --platform iOS
 script:
   - set -o pipefail
-  - travis_retry xcodebuild -project KRProgressHUD.xcodeproj -scheme KRProgressHUD -destination "platform=iOS Simulator,name=iPhone 8" build-for-testing test | xcpretty
-env:
-  global:
-    secure: H2F4FRck9DrekGj3GVscqwrK+Sf53UZeENw59GPXXIL3drotK0xn1sOS6kUe3vq+zOOa3s8QRixMB0XfEsu2lALz5/QA7rdaRQTIgybDs7bPUuJte4l/CIBY0c56vIUIIYTRSd2kjeCQp0xWWn9mhK5sHYDkDLMxINEx78+coEuwp0tOhPRrVczhtbTCfdi8CZI94RwxHHem1H7FNCvl7tPBh4hIxIryCFoXkodGYMfYbJ1td6HXvQFU8qIS7IHta63jEbZPXLOHUC4o4bFNtgtj9n6Qh/lb5DrWvSdmCwxebaiXEMQ0chyev17X2koIzqpTo7zgSFEZWaqKj+WpAHUeUEcWlc0P7fMRTE/jOhSm4YnuMXSWRbFPWy//Jl07dZAZaZY9Yf6nQ4j4r3rzQubfrm336ofWv4RTdsQ2JuNUX9NHB2829ctj2hEsMjJfh6r7rnkzZt7VgG7vRQTKU/U/kwfW2NQmOwZNu2zSBXQArIGu6fE6WmwZcZbVA9fZF7l40do71KFywYgECBnWkmt6xEpdeH6Me6BI9tG5I5em1Do3x+UBQmPvilPe2r+vOqcZdBRL3zu7sQXgiBeeE3pqttxcV/QYQjZfQrZTaBbjke/Ov+fHdKZ+vyzIy82gGnsU0zhK7iYaDhtV6PW3E9lMFOY1AEI61mEy7untJQU=
+  - travis_retry xcodebuild -project KRProgressHUD.xcodeproj -scheme KRProgressHUD -destination "platform=iOS Simulator,name=iPhone Xs" build-for-testing test | xcpretty
 notifications:
   email: false
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "krimpedance/KRActivityIndicatorView" == 3.0.0
+github "krimpedance/KRActivityIndicatorView" == 3.0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.3.1"
-github "Quick/Quick" "v1.3.2"
-github "krimpedance/KRActivityIndicatorView" "3.0.0"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.1.0"
+github "krimpedance/KRActivityIndicatorView" "3.0.2"
diff --git a/DEMO/.swiftlint.yml b/DEMO/.swiftlint.yml
@@ -1,13 +1,10 @@
-disabled_rules: # 適用したくないチェック項目を記述
+disabled_rules:
   - line_length
   - file_length
-included: # Lint対象のファイルのあるパスを記述、通常はプロジェクト名になると思います
-  - KRProgressHUDDEMO
-excluded: # Lint対象から外すファイルのあるパスを記述、CocoaPodsやCarthage
+included:
+  - KRProgressHUDDemo
+excluded:
   - Pods
-# パラメータ（ここではline_lengthの値）をカスタマイズする、warningを出す値でerrorは出なくなる
-line_length: 360
-# パラメータ（ここではtype_body_lengthの値）をカスタマイズする、最初の値がwarningで２つ目の値がerror
 type_body_length:
   - 400 # warning
   - 500 # error
diff --git a/DEMO/KRProgressHUDDemo.xcodeproj/project.pbxproj b/DEMO/KRProgressHUDDemo.xcodeproj/project.pbxproj
diff --git a/DEMO/KRProgressHUDDemo.xcworkspace/contents.xcworkspacedata b/DEMO/KRProgressHUDDemo.xcworkspace/contents.xcworkspacedata
diff --git a/DEMO/KRProgressHUDDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DEMO/KRProgressHUDDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/DEMO/KRProgressHUDDemo/Info.plist b/DEMO/KRProgressHUDDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/DEMO/Podfile b/DEMO/Podfile
@@ -0,0 +1,7 @@
+# Podfile
+platform :ios, '12.2'
+
+target 'KRProgressHUDDemo' do
+  use_frameworks!
+  pod 'KRProgressHUD', path: '../KRProgressHUD.podspec'
+end
diff --git a/DEMO/Podfile.lock b/DEMO/Podfile.lock
@@ -0,0 +1,23 @@
+PODS:
+  - KRActivityIndicatorView (3.0.2)
+  - KRProgressHUD (3.4.1):
+    - KRActivityIndicatorView (= 3.0.2)
+
+DEPENDENCIES:
+  - KRProgressHUD (from `../KRProgressHUD.podspec`)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - KRActivityIndicatorView
+
+EXTERNAL SOURCES:
+  KRProgressHUD:
+    :path: "../KRProgressHUD.podspec"
+
+SPEC CHECKSUMS:
+  KRActivityIndicatorView: a2022d5d3e366207d2690f6bcc550f83aa91241b
+  KRProgressHUD: 115363b48feb530ab1f36c4146ed22e779e0f5aa
+
+PODFILE CHECKSUM: 17255777f65cedee62d12f3711c7dfd984cb57a1
+
+COCOAPODS: 1.6.1
diff --git a/KRProgressHUD.podspec b/KRProgressHUD.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "KRProgressHUD"
-  s.version      = "3.4.0"
+  s.version      = "3.4.1"
   s.summary      = "A beautiful progress HUD for your iOS."
   s.description  = "KRProgressHUD is a beautiful and easy-to-use HUD meant to display the progress on iOS."
   s.homepage     = "https://github.com/krimpedance/KRProgressHUD"
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/krimpedance/KRProgressHUD.git", :tag => s.version.to_s }
   s.source_files = "KRProgressHUD/**/*.swift"
 
-  s.dependency "KRActivityIndicatorView", "3.0.0"
+  s.dependency "KRActivityIndicatorView", "3.0.2"
 end
diff --git a/KRProgressHUD.xcodeproj/project.pbxproj b/KRProgressHUD.xcodeproj/project.pbxproj
@@ -224,10 +224,11 @@
 			};
 			buildConfigurationList = 4BA70C2A1D02F28D009EB743 /* Build configuration list for PBXProject "KRProgressHUD" */;
 			compatibilityVersion = "Xcode 10.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 4BA70C261D02F28D009EB743;
 			productRefGroup = 4BA70C311D02F28D009EB743 /* Products */;
@@ -270,7 +271,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -325,7 +326,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "";
 			};
 			name = Debug;
@@ -348,7 +349,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mond.krimpedance.KRProgressHUDTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "";
 			};
 			name = Release;
@@ -401,13 +402,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -456,12 +457,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -497,7 +498,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -528,7 +529,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/KRProgressHUD/Classes/InnerKRProgressHUD.swift b/KRProgressHUD/Classes/InnerKRProgressHUD.swift
@@ -246,10 +246,10 @@ extension KRProgressHUD {
     func setConstraintsToPresentingVC() {
         guard let view = presentingViewController?.view, view == hudViewController.view.superview else { return }
         view.addConstraints([
-            NSLayoutConstraint(item: hudViewController.view, attribute: .top, toItem: view),
-            NSLayoutConstraint(item: hudViewController.view, attribute: .bottom, toItem: view),
-            NSLayoutConstraint(item: hudViewController.view, attribute: .left, toItem: view),
-            NSLayoutConstraint(item: hudViewController.view, attribute: .right, toItem: view)
+            NSLayoutConstraint(item: hudViewController.view!, attribute: .top, toItem: view),
+            NSLayoutConstraint(item: hudViewController.view!, attribute: .bottom, toItem: view),
+            NSLayoutConstraint(item: hudViewController.view!, attribute: .left, toItem: view),
+            NSLayoutConstraint(item: hudViewController.view!, attribute: .right, toItem: view)
         ])
     }
 }
diff --git a/KRProgressHUD/Info.plist b/KRProgressHUD/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@
 
 ## Requirements
 - iOS 8.0+
-- Xcode 10.0+
-- Swift 4.2+
+- Xcode 10.2+
+- Swift 5.0+
 
 ## DEMO
 To run the example project, clone the repo, and open `KRProgressHUDDemo.xcodeproj` from the DEMO directory.
@@ -175,6 +175,9 @@ These `set()` setting can be reset by
 I'm seeking bug reports and feature requests.
 
 ## Release Note
++ 3.4.1 :
+  - Compatible with Swift 5.0.
+
 + 3.4.0 :
   - Updated for KRActivityIndicatorView@3.0.0.
   - Few properties and methods were renamed.
diff --git a/README_Ja.md b/README_Ja.md
@@ -22,8 +22,8 @@
 
 ## 必要環境
 - iOS 8.0+
-- Xcode 10.0+
-- Swift 4.2+
+- Xcode 10.2+
+- Swift 5.0+
 
 ## デモ
 `DEMO/`以下にあるサンプルプロジェクトから確認してください.
@@ -175,6 +175,9 @@ KRProgressHUD
 バグや機能のリクエストがありましたら, 気軽にコメントしてください.
 
 ## リリースノート
++ 3.4.1 :
+  - Swift 5.0 に対応.
+
 + 3.4.0 :
   - KRActivityIndicatorView@3.0.0 に対応.
   - いくつかのプロパティ名と関数名を変更.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "krimpedance/KRActivityIndicatorView" == 3.0.0`
	`1`	`+github "krimpedance/KRActivityIndicatorView" == 3.0.2`