From 80a28c6f997095f3953bf0dffff048490e04d710 Mon Sep 17 00:00:00 2001 From: Saied Nawaz Date: Mon, 1 Apr 2019 16:47:49 +0100 Subject: [PATCH 1/2] Updated project to work with Swift 5, incremented pod number --- ACTabScrollView.podspec | 4 ++-- ACTabScrollView.xcodeproj/project.pbxproj | 9 +++++---- ACTabScrollView/AppDelegate.swift | 2 +- ACTabScrollView/Base.lproj/LaunchScreen.xib | 22 ++++++++++++--------- ACTabScrollView/Base.lproj/Main.storyboard | 11 +++++------ ACTabScrollView/ContentViewController.swift | 2 +- ACTabScrollView/NewsViewController.swift | 10 +++++++--- Sources/ACTabScrollView.swift | 6 +++--- 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/ACTabScrollView.podspec b/ACTabScrollView.podspec index 69462f1..ff96fdf 100644 --- a/ACTabScrollView.podspec +++ b/ACTabScrollView.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "ACTabScrollView" - s.version = "0.3.0" + s.version = "0.4.0" s.summary = "A fancy `Menu` and `Pager` UI extends `UIScrollView` with elegant, smooth and synchronized scrolling `tabs`." s.description = <<-DESC @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/azurechen/ACTabScrollView" s.license = "MIT" s.author = { "Azure Chen" => "azure517981@gmail.com" } - s.source = { :git => "https://github.com/azurechen/ACTabScrollView.git", :tag => "v0.3.0" } + s.source = { :git => "https://github.com/azurechen/ACTabScrollView.git", :tag => "v0.4.0" } s.platforms = { :ios => "8.0" } s.source_files = "Sources/**/*.swift" diff --git a/ACTabScrollView.xcodeproj/project.pbxproj b/ACTabScrollView.xcodeproj/project.pbxproj index fe5ca07..0f9e0ec 100644 --- a/ACTabScrollView.xcodeproj/project.pbxproj +++ b/ACTabScrollView.xcodeproj/project.pbxproj @@ -201,6 +201,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -402,7 +403,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.azurechen.ACTabScrollView; PRODUCT_NAME = ACTabScrollView; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -419,7 +420,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.azurechen.ACTabScrollView; PRODUCT_NAME = ACTabScrollView; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -439,7 +440,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.azurechen.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ACTabScrollView; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ACTabScrollView.app/ACTabScrollView"; }; name = Debug; @@ -456,7 +457,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.azurechen.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ACTabScrollView; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ACTabScrollView.app/ACTabScrollView"; }; name = Release; 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/LaunchScreen.xib b/ACTabScrollView/Base.lproj/LaunchScreen.xib index e7eb5fd..7ab620e 100644 --- a/ACTabScrollView/Base.lproj/LaunchScreen.xib +++ b/ACTabScrollView/Base.lproj/LaunchScreen.xib @@ -1,8 +1,12 @@ - - + + + + + - - + + + @@ -11,20 +15,20 @@ - - + diff --git a/ACTabScrollView/Base.lproj/Main.storyboard b/ACTabScrollView/Base.lproj/Main.storyboard index 15a078d..18a49e6 100644 --- a/ACTabScrollView/Base.lproj/Main.storyboard +++ b/ACTabScrollView/Base.lproj/Main.storyboard @@ -1,12 +1,11 @@ - + - - + @@ -51,13 +50,13 @@ - +