diff --git a/.travis.yml b/.travis.yml index 1410babc..39a62ced 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c -osx_image: xcode10 +osx_image: xcode10.1 env: - - DESTINATION="OS=12,name=iPhone 8" SCHEME="XLPagerTabStrip" SDK=iphonesimulator + - DESTINATION="OS=12.1,name=iPhone 8" SCHEME="XLPagerTabStrip" SDK=iphonesimulator before_install: - brew update #- brew outdated carthage || brew upgrade carthage diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj index 1a8de222..2731472e 100644 --- a/Example.xcodeproj/project.pbxproj +++ b/Example.xcodeproj/project.pbxproj @@ -98,7 +98,7 @@ 28F828CF1C4B714D00330CF4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Example/AppDelegate.swift; sourceTree = ""; }; 28F828DB1C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Example/Info.plist; sourceTree = ""; }; 28F828E01C4B714D00330CF4 /* ExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 28F828E61C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = Example/ExampleUITests/Info.plist; sourceTree = ""; }; + 28F828E61C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CB2125DD1C52A80E002DAF42 /* TwitterExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TwitterExampleViewController.swift; path = Example/TwitterExampleViewController.swift; sourceTree = ""; }; CB3697BE1C5177B4001FC5F8 /* ButtonBarExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ButtonBarExampleViewController.swift; path = Example/Example/ButtonBarExampleViewController.swift; sourceTree = SOURCE_ROOT; }; CB71C6EA1C4EB964008EC806 /* SegmentedExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SegmentedExampleViewController.swift; path = Example/SegmentedExampleViewController.swift; sourceTree = ""; }; @@ -232,7 +232,8 @@ 28F828E61C4B714D00330CF4 /* Info.plist */, 287D0A711C4B7877004566D6 /* ExampleUITests.swift */, ); - path = ExampleUITests; + name = ExampleUITests; + path = Example/ExampleUITests; sourceTree = ""; }; CB86ED6C1C4D6ED400DA463B /* Demo */ = { @@ -560,13 +561,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; INFOPLIST_FILE = "$(SRCROOT)/Example/Example/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -577,12 +579,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; INFOPLIST_FILE = "$(SRCROOT)/Example/Example/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift index 2b1cd0b4..57de2d71 100644 --- a/Example/Example/AppDelegate.swift +++ b/Example/Example/AppDelegate.swift @@ -12,11 +12,10 @@ 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. UITabBar.appearance().tintColor = UIColor.init(red: 0.027, green: 0.725, blue: 0.608, alpha: 1) - UIApplication.shared.statusBarStyle = .lightContent _ = YoutubeExampleViewController(nibName: nil, bundle: nil) diff --git a/Example/Example/Base.lproj/Storyboard.storyboard b/Example/Example/Base.lproj/Storyboard.storyboard index 94e103bd..d91e9050 100644 --- a/Example/Example/Base.lproj/Storyboard.storyboard +++ b/Example/Example/Base.lproj/Storyboard.storyboard @@ -1,13 +1,11 @@ - + - - - + @@ -84,7 +82,7 @@ - + + - - + - + - - - + + + + + - - + - - - - - - - - - - - - @@ -146,7 +133,7 @@ - + @@ -437,7 +424,7 @@ - + @@ -886,7 +873,7 @@ - + @@ -990,7 +977,7 @@ - + diff --git a/Example/Example/ChildControllers/TableChildExampleViewController.swift b/Example/Example/ChildControllers/TableChildExampleViewController.swift index 35ffd392..b0395bc1 100644 --- a/Example/Example/ChildControllers/TableChildExampleViewController.swift +++ b/Example/Example/ChildControllers/TableChildExampleViewController.swift @@ -31,7 +31,7 @@ class TableChildExampleViewController: UITableViewController, IndicatorInfoProvi var blackTheme = false var itemInfo = IndicatorInfo(title: "View") - init(style: UITableViewStyle, itemInfo: IndicatorInfo) { + init(style: UITableView.Style, itemInfo: IndicatorInfo) { self.itemInfo = itemInfo super.init(style: style) } @@ -43,8 +43,8 @@ class TableChildExampleViewController: UITableViewController, IndicatorInfoProvi override func viewDidLoad() { super.viewDidLoad() tableView.register(UINib(nibName: "PostCell", bundle: Bundle.main), forCellReuseIdentifier: cellIdentifier) - tableView.estimatedRowHeight = 60.0 - tableView.rowHeight = UITableViewAutomaticDimension + tableView.estimatedRowHeight = 600.0 + tableView.rowHeight = UITableView.automaticDimension tableView.allowsSelection = false if blackTheme { tableView.backgroundColor = UIColor(red: 15/255.0, green: 16/255.0, blue: 16/255.0, alpha: 1.0) diff --git a/Example/Example/Helpers/PostCell.xib b/Example/Example/Helpers/PostCell.xib index 5234c22f..a2eba45c 100644 --- a/Example/Example/Helpers/PostCell.xib +++ b/Example/Example/Helpers/PostCell.xib @@ -1,11 +1,11 @@ - + - + @@ -25,14 +25,17 @@ -