Commit f29e391c by Daniel Dahan

added swift 5 support

parent ffadec90
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '3.0.0' s.version = '3.1.0'
s.swift_version = '4.2' s.swift_version = '5.0'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'A UI/UX framework for creating beautiful applications.' s.summary = 'A UI/UX framework for creating beautiful applications.'
s.homepage = 'http://cosmicmind.com' s.homepage = 'http://cosmicmind.com'
......
...@@ -931,7 +931,7 @@ ...@@ -931,7 +931,7 @@
CreatedOnToolsVersion = 6.4; CreatedOnToolsVersion = 6.4;
DevelopmentTeam = 9Z76XCNLGL; DevelopmentTeam = 9Z76XCNLGL;
DevelopmentTeamName = "CosmicMind Inc."; DevelopmentTeamName = "CosmicMind Inc.";
LastSwiftMigration = 1000; LastSwiftMigration = 1020;
ProvisioningStyle = Manual; ProvisioningStyle = Manual;
}; };
}; };
...@@ -1245,7 +1245,7 @@ ...@@ -1245,7 +1245,7 @@
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 5.0;
}; };
name = Debug; name = Debug;
}; };
...@@ -1270,7 +1270,7 @@ ...@@ -1270,7 +1270,7 @@
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 5.0;
}; };
name = Release; name = Release;
}; };
......
Subproject commit 713926bca23ccfb6f68d2ffe525cdb91dc55ff44 Subproject commit 03a8f562dd6850cf2ada59c49ec85c0f540ef9ee
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.0</string> <string>3.1.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -80,7 +80,7 @@ open class BaseButtonGroup<T: Button>: View { ...@@ -80,7 +80,7 @@ open class BaseButtonGroup<T: Button>: View {
@objc @objc
private func didTap(_ sender: Button) { private func didTap(_ sender: Button) {
guard let sender = sender as? T, guard let sender = sender as? T,
let index = buttons.index(of: sender) let index = buttons.firstIndex(of: sender)
else { return } else { return }
didTap(button: sender, at: index) didTap(button: sender, at: index)
......
...@@ -50,7 +50,7 @@ open class CheckButtonGroup: BaseButtonGroup<CheckButton> { ...@@ -50,7 +50,7 @@ open class CheckButtonGroup: BaseButtonGroup<CheckButton> {
/// Returns indexes of all selected check buttons within the group /// Returns indexes of all selected check buttons within the group
/// or empty array if none is seleceted. /// or empty array if none is seleceted.
open var selectedIndices: [Int] { open var selectedIndices: [Int] {
return selecetedButtons.map { buttons.index(of: $0)! } return selecetedButtons.map { buttons.firstIndex(of: $0)! }
} }
open override func didTap(button: CheckButton, at index: Int) { open override func didTap(button: CheckButton, at index: Int) {
......
...@@ -51,7 +51,7 @@ open class RadioButtonGroup: BaseButtonGroup<RadioButton> { ...@@ -51,7 +51,7 @@ open class RadioButtonGroup: BaseButtonGroup<RadioButton> {
/// If none is selected (e.g in initial state), -1 is returned. /// If none is selected (e.g in initial state), -1 is returned.
open var selectedIndex: Int { open var selectedIndex: Int {
guard let b = selectedButton else { return -1 } guard let b = selectedButton else { return -1 }
return buttons.index(of: b)! return buttons.firstIndex(of: b)!
} }
open override func didTap(button: RadioButton, at index: Int) { open override func didTap(button: RadioButton, at index: Int) {
......
...@@ -216,7 +216,7 @@ internal extension NavigationController { ...@@ -216,7 +216,7 @@ internal extension NavigationController {
- Parameter from item: A UINavigationItem. - Parameter from item: A UINavigationItem.
*/ */
func removeBackButton(from item: UINavigationItem) { func removeBackButton(from item: UINavigationItem) {
if let index = item.leftViews.index(of: item.backButton) { if let index = item.leftViews.firstIndex(of: item.backButton) {
item.leftViews.remove(at: index) item.leftViews.remove(at: index)
} }
......
...@@ -282,11 +282,11 @@ fileprivate extension TabsController { ...@@ -282,11 +282,11 @@ fileprivate extension TabsController {
- Parameter completion: An optional completion block. - Parameter completion: An optional completion block.
*/ */
func transition(to viewController: UIViewController, isTriggeredByUserInteraction: Bool, completion: ((Bool) -> Void)?) { func transition(to viewController: UIViewController, isTriggeredByUserInteraction: Bool, completion: ((Bool) -> Void)?) {
guard let fvcIndex = viewControllers.index(of: rootViewController) else { guard let fvcIndex = viewControllers.firstIndex(of: rootViewController) else {
return return
} }
guard let tvcIndex = viewControllers.index(of: viewController) else { guard let tvcIndex = viewControllers.firstIndex(of: viewController) else {
return return
} }
...@@ -536,7 +536,7 @@ extension TabsController { ...@@ -536,7 +536,7 @@ extension TabsController {
extension TabsController: _TabBarDelegate { extension TabsController: _TabBarDelegate {
@objc @objc
func _tabBar(tabBar: TabBar, shouldSelect tabItem: TabItem) -> Bool { func _tabBar(tabBar: TabBar, shouldSelect tabItem: TabItem) -> Bool {
guard let i = tabBar.tabItems.index(of: tabItem) else { guard let i = tabBar.tabItems.firstIndex(of: tabItem) else {
return false return false
} }
......
...@@ -766,7 +766,7 @@ private extension TextField { ...@@ -766,7 +766,7 @@ private extension TextField {
/// Remove view from rightView. /// Remove view from rightView.
func removeFromRightView(view: UIView?) { func removeFromRightView(view: UIView?) {
guard let v = view, let i = rightView?.grid.views.index(of: v) else { guard let v = view, let i = rightView?.grid.views.firstIndex(of: v) else {
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment