diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 9f55b2c..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -3.0 diff --git a/EZLoadingActivity.podspec b/EZLoadingActivity.podspec index a92f1af..e88e930 100644 --- a/EZLoadingActivity.podspec +++ b/EZLoadingActivity.podspec @@ -1,16 +1,14 @@ Pod::Spec.new do |s| -s.name = "EZLoadingActivity" -s.version = "1.01" -s.summary = "Lightweight Swift loading activity for iOS7+" -s.description = "Lightweight Swift loading activity for iOS7+. Really simple to use, just add the class and write 1 line of code." -s.homepage = "https://github.com/goktugyil/EZLoadingActivity" -s.license = 'MIT' -s.author = { "goktugyil" => "gok-2@hotmail.com" } -s.source = { :git => "https://github.com/goktugyil/EZLoadingActivity.git", :tag => s.version.to_s } -s.platform = :ios, '8.0' -s.requires_arc = true - -# If more than one source file: https://guides.cocoapods.org/syntax/podspec.html#source_files -s.source_files = 'EZLoadingActivity.swift' - + s.name = "EZLoadingActivity" + s.version = "1.2" + s.summary = "Lightweight Swift loading activity for iOS8+" + s.description = "Lightweight Swift loading activity for iOS8+. Really simple to use, just add the class and write 1 line of code." + s.homepage = "https://github.com/goktugyil/EZLoadingActivity" + s.license = 'MIT' + s.author = { "goktugyil" => "gok-2@hotmail.com" } + s.source = { :git => "https://github.com/goktugyil/EZLoadingActivity.git", :tag => s.version.to_s } + s.platform = :ios, '8.0' + s.swift_version = '4.2' + s.requires_arc = true + s.source_files = 'EZLoadingActivity.swift' end diff --git a/EZLoadingActivity.swift b/EZLoadingActivity.swift index 8a96d52..6dcae5e 100755 --- a/EZLoadingActivity.swift +++ b/EZLoadingActivity.swift @@ -151,7 +151,7 @@ public struct EZLoadingActivity { let yPosition = frame.height/2 - 20 - activityView = UIActivityIndicatorView(activityIndicatorStyle: UIActivityIndicatorViewStyle.whiteLarge) + activityView = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.whiteLarge) activityView.frame = CGRect(x: 10, y: yPosition, width: 40, height: 40) activityView.color = Settings.ActivityColor activityView.startAnimating() @@ -285,17 +285,17 @@ private extension UIView { /// Extension: insert view.fadeTransition right before changing content func fadeTransition(_ duration: CFTimeInterval) { let animation: CATransition = CATransition() - animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) - animation.type = kCATransitionFade + animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) + animation.type = CATransitionType.fade animation.duration = duration - self.layer.add(animation, forKey: kCATransitionFade) + self.layer.add(animation, forKey: CATransitionType.fade.rawValue) } } private extension NSObject { func callSelectorAsync(_ selector: Selector, delay: TimeInterval) { let timer = Timer.scheduledTimer(timeInterval: delay, target: self, selector: selector, userInfo: nil, repeats: false) - RunLoop.main.add(timer, forMode: RunLoopMode.commonModes) + RunLoop.main.add(timer, forMode: RunLoop.Mode.common) } } @@ -307,7 +307,7 @@ private extension UIScreen { } class var ScreenWidth: CGFloat { get { - if UIInterfaceOrientationIsPortrait(Orientation) { + if Orientation.isPortrait { return UIScreen.main.bounds.size.width } else { return UIScreen.main.bounds.size.height @@ -316,7 +316,7 @@ private extension UIScreen { } class var ScreenHeight: CGFloat { get { - if UIInterfaceOrientationIsPortrait(Orientation) { + if Orientation.isPortrait { return UIScreen.main.bounds.size.height } else { return UIScreen.main.bounds.size.width diff --git a/EZLoadingActivity.xcodeproj/project.pbxproj b/EZLoadingActivity.xcodeproj/project.pbxproj index 7c4cdd6..c2672a3 100644 --- a/EZLoadingActivity.xcodeproj/project.pbxproj +++ b/EZLoadingActivity.xcodeproj/project.pbxproj @@ -145,16 +145,16 @@ E13884661C02D85500663C96 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Goktug Yilmaz"; TargetAttributes = { 1F764D521C1EA1AF007C51AD = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 1000; }; E138846D1C02D85500663C96 = { CreatedOnToolsVersion = 7.0.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; }; }; @@ -254,7 +254,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.gbf.EZLoadingActivity-iOS"; PRODUCT_NAME = EZLoadingActivity; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -276,7 +275,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.gbf.EZLoadingActivity-iOS"; PRODUCT_NAME = EZLoadingActivity; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -290,14 +288,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -325,7 +331,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -338,14 +344,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -366,7 +380,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -381,7 +395,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.gbf.EZLoadingActivity; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; }; name = Debug; }; @@ -394,7 +408,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.gbf.EZLoadingActivity; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; }; name = Release; }; diff --git a/EZLoadingActivity.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/EZLoadingActivity.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/EZLoadingActivity.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/EZLoadingActivity.xcodeproj/xcshareddata/xcschemes/EZLoadingActivity_iOS.xcscheme b/EZLoadingActivity.xcodeproj/xcshareddata/xcschemes/EZLoadingActivity_iOS.xcscheme index ba8d8ab..8764258 100644 --- a/EZLoadingActivity.xcodeproj/xcshareddata/xcschemes/EZLoadingActivity_iOS.xcscheme +++ b/EZLoadingActivity.xcodeproj/xcshareddata/xcschemes/EZLoadingActivity_iOS.xcscheme @@ -1,6 +1,6 @@