From 903595a9b537580620fdea2dfb7092d77b5e6d20 Mon Sep 17 00:00:00 2001 From: hir-suzuki <> Date: Thu, 4 Oct 2018 10:57:41 +0900 Subject: [PATCH 1/2] update swift4.2 --- ACTabScrollView.xcodeproj/project.pbxproj | 20 ++++++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ ACTabScrollView/AppDelegate.swift | 2 +- ACTabScrollView/Base.lproj/Main.storyboard | 42 ++---------------- ACTabScrollView/ContentViewController.swift | 2 +- ACTabScrollView/Demo.xib | 44 +++++++++++++++++++ ACTabScrollView/NewsViewController.swift | 10 +++-- Sources/ACTabScrollView.swift | 2 +- 8 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 ACTabScrollView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ACTabScrollView/Demo.xib diff --git a/ACTabScrollView.xcodeproj/project.pbxproj b/ACTabScrollView.xcodeproj/project.pbxproj index fe5ca07..50bac94 100644 --- a/ACTabScrollView.xcodeproj/project.pbxproj +++ b/ACTabScrollView.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 295D89162165AAA700487C3B /* Demo.xib in Resources */ = {isa = PBXBuildFile; fileRef = 295D89152165AAA700487C3B /* Demo.xib */; }; 530068331CEDDE7600A80F09 /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 530068321CEDDE7600A80F09 /* ContentViewController.swift */; }; 530068351CF0512F00A80F09 /* MockData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 530068341CF0512F00A80F09 /* MockData.swift */; }; 53887DDB1CE8AD3D001E6FD3 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53887DDA1CE8AD3D001E6FD3 /* DemoViewController.swift */; }; @@ -31,6 +32,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 295D89152165AAA700487C3B /* Demo.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Demo.xib; sourceTree = ""; }; 530068321CEDDE7600A80F09 /* ContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = ""; }; 530068341CF0512F00A80F09 /* MockData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockData.swift; sourceTree = ""; }; 53887DDA1CE8AD3D001E6FD3 /* DemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = ""; }; @@ -94,6 +96,7 @@ 530068321CEDDE7600A80F09 /* ContentViewController.swift */, 53887DDA1CE8AD3D001E6FD3 /* DemoViewController.swift */, 6DB0CD291B8462B90069AE39 /* Main.storyboard */, + 295D89152165AAA700487C3B /* Demo.xib */, 6DB0CD2C1B8462B90069AE39 /* Images.xcassets */, 6DB0CD2E1B8462B90069AE39 /* LaunchScreen.xib */, 6DB0CD231B8462B90069AE39 /* Supporting Files */, @@ -181,12 +184,12 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0910; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = AzureChen; TargetAttributes = { 6DB0CD1F1B8462B90069AE39 = { CreatedOnToolsVersion = 6.4; - DevelopmentTeam = AFJ2WGE2QB; + DevelopmentTeam = 9JMCJCA8J2; LastSwiftMigration = 0800; }; 6DB0CD341B8462B90069AE39 = { @@ -221,6 +224,7 @@ buildActionMask = 2147483647; files = ( 6DB0CD2B1B8462B90069AE39 /* Main.storyboard in Resources */, + 295D89162165AAA700487C3B /* Demo.xib in Resources */, 6DB0CD301B8462B90069AE39 /* LaunchScreen.xib in Resources */, 6DB0CD2D1B8462B90069AE39 /* Images.xcassets in Resources */, ); @@ -300,12 +304,14 @@ 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; @@ -354,12 +360,14 @@ 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; @@ -395,14 +403,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = AFJ2WGE2QB; + DEVELOPMENT_TEAM = 9JMCJCA8J2; INFOPLIST_FILE = ACTabScrollView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.azurechen.ACTabScrollView; PRODUCT_NAME = ACTabScrollView; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -412,14 +420,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = AFJ2WGE2QB; + DEVELOPMENT_TEAM = 9JMCJCA8J2; INFOPLIST_FILE = ACTabScrollView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.azurechen.ACTabScrollView; PRODUCT_NAME = ACTabScrollView; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/ACTabScrollView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ACTabScrollView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ACTabScrollView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ACTabScrollView/AppDelegate.swift b/ACTabScrollView/AppDelegate.swift index 631e32e..40d3054 100644 --- a/ACTabScrollView/AppDelegate.swift +++ b/ACTabScrollView/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/ACTabScrollView/Base.lproj/Main.storyboard b/ACTabScrollView/Base.lproj/Main.storyboard index 15a078d..df7bec8 100644 --- a/ACTabScrollView/Base.lproj/Main.storyboard +++ b/ACTabScrollView/Base.lproj/Main.storyboard @@ -1,12 +1,11 @@ - + - - + @@ -51,13 +50,13 @@ - + diff --git a/ACTabScrollView/ContentViewController.swift b/ACTabScrollView/ContentViewController.swift index b96528d..cd70257 100644 --- a/ACTabScrollView/ContentViewController.swift +++ b/ACTabScrollView/ContentViewController.swift @@ -26,7 +26,7 @@ class ContentViewController: UIViewController, UITableViewDelegate, UITableViewD override func viewDidLoad() { super.viewDidLoad() - tableView.rowHeight = UITableViewAutomaticDimension + tableView.rowHeight = UITableView.automaticDimension tableView.estimatedRowHeight = 44 tableView.delegate = self tableView.dataSource = self diff --git a/ACTabScrollView/Demo.xib b/ACTabScrollView/Demo.xib new file mode 100644 index 0000000..acccf12 --- /dev/null +++ b/ACTabScrollView/Demo.xib @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ACTabScrollView/NewsViewController.swift b/ACTabScrollView/NewsViewController.swift index c188ec5..ebee8c7 100644 --- a/ACTabScrollView/NewsViewController.swift +++ b/ACTabScrollView/NewsViewController.swift @@ -14,6 +14,10 @@ class NewsViewController: UIViewController, ACTabScrollViewDelegate, ACTabScroll var contentViews: [UIView] = [] + override var preferredStatusBarStyle : UIStatusBarStyle { + return .lightContent + } + override func viewDidLoad() { super.viewDidLoad() @@ -36,7 +40,7 @@ class NewsViewController: UIViewController, ACTabScrollViewDelegate, ACTabScroll let vc = storyboard.instantiateViewController(withIdentifier: "ContentViewController") as! ContentViewController vc.category = category - addChildViewController(vc) // don't forget, it's very important + addChild(vc) // don't forget, it's very important contentViews.append(vc.view) } @@ -45,11 +49,11 @@ class NewsViewController: UIViewController, ACTabScrollViewDelegate, ACTabScroll navigationBar.isTranslucent = false navigationBar.tintColor = UIColor.white navigationBar.barTintColor = UIColor(red: 38.0 / 255, green: 191.0 / 255, blue: 140.0 / 255, alpha: 1) - navigationBar.titleTextAttributes = NSDictionary(object: UIColor.white, forKey: NSAttributedStringKey.foregroundColor as NSCopying) as? [NSAttributedStringKey : AnyObject] + navigationBar.titleTextAttributes = NSDictionary(object: UIColor.white, forKey: NSAttributedString.Key.foregroundColor as NSCopying) as? [NSAttributedString.Key : AnyObject] navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) navigationBar.shadowImage = UIImage() } - UIApplication.shared.statusBarStyle = UIStatusBarStyle.lightContent + setNeedsStatusBarAppearanceUpdate() } // MARK: ACTabScrollViewDelegate diff --git a/Sources/ACTabScrollView.swift b/Sources/ACTabScrollView.swift index bc1133d..4585374 100644 --- a/Sources/ACTabScrollView.swift +++ b/Sources/ACTabScrollView.swift @@ -406,7 +406,7 @@ open class ACTabScrollView: UIView, UIScrollViewDelegate { if let tab = self.cachedPageTabs[i] { if (animated) { - UIView.animate(withDuration: 0.5, delay: 0, options: UIViewAnimationOptions.allowUserInteraction, animations: { + UIView.animate(withDuration: 0.5, delay: 0, options: UIView.AnimationOptions.allowUserInteraction, animations: { tab.alpha = alpha return }, completion: nil) From 659fbbf805038e3223df0f91e3b6e1cd2f8b5903 Mon Sep 17 00:00:00 2001 From: hir-suzuki <> Date: Thu, 4 Oct 2018 10:59:03 +0900 Subject: [PATCH 2/2] delete signature --- ACTabScrollView.xcodeproj/project.pbxproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ACTabScrollView.xcodeproj/project.pbxproj b/ACTabScrollView.xcodeproj/project.pbxproj index 50bac94..73dcf75 100644 --- a/ACTabScrollView.xcodeproj/project.pbxproj +++ b/ACTabScrollView.xcodeproj/project.pbxproj @@ -189,7 +189,6 @@ TargetAttributes = { 6DB0CD1F1B8462B90069AE39 = { CreatedOnToolsVersion = 6.4; - DevelopmentTeam = 9JMCJCA8J2; LastSwiftMigration = 0800; }; 6DB0CD341B8462B90069AE39 = { @@ -403,7 +402,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 9JMCJCA8J2; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = ACTabScrollView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -420,7 +419,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 9JMCJCA8J2; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = ACTabScrollView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";