Merge pull request #57 from thefuntasty/feature/swift-5.0

Swift 5.0

Author: mkj-is

Configs/FuntastyKit.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

FuntastyKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "FuntastyKit"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
   s.summary = "A collection of Swift utilities and protocols used in our projects."
   s.description = <<-DESC
      MVVM-C architecture, service holder for code injection of services
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.author = { "Matěj K. Jirásek" => "[email protected]" }
   s.social_media_url = "https://twitter.com/TheFuntasty"
   s.platform = :ios, "9.0"
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
   s.source = { :git => "https://github.com/thefuntasty/FuntastyKit.git", :tag => s.version.to_s }
   s.source_files = "Sources/**/*"
   s.frameworks = "Foundation", "UIKit"

FuntastyKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
                BuildableName = "FuntastyKit.framework"
-               BlueprintName = "FuntastyKit-iOS"
+               BlueprintName = "FuntastyKit"
                ReferencedContainer = "container:FuntastyKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "52D6D9851BEFF229002C0205"
-               BuildableName = "FuntastyKit-iOS Tests.xctest"
-               BlueprintName = "FuntastyKit-iOS Tests"
+               BuildableName = "FuntastyKit Tests.xctest"
+               BlueprintName = "FuntastyKit Tests"
                ReferencedContainer = "container:FuntastyKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -44,7 +44,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
             BuildableName = "FuntastyKit.framework"
-            BlueprintName = "FuntastyKit-iOS"
+            BlueprintName = "FuntastyKit"
             ReferencedContainer = "container:FuntastyKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -66,7 +66,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
             BuildableName = "FuntastyKit.framework"
-            BlueprintName = "FuntastyKit-iOS"
+            BlueprintName = "FuntastyKit"
             ReferencedContainer = "container:FuntastyKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -84,7 +84,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
             BuildableName = "FuntastyKit.framework"
-            BlueprintName = "FuntastyKit-iOS"
+            BlueprintName = "FuntastyKit"
             ReferencedContainer = "container:FuntastyKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

FuntastyKit.xcodeproj/xcshareddata/xcschemes/FuntastyKit-macOS.xcscheme

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 The FUNTASTY
+Copyright (c) 2019 FUNTASTY Digital s.r.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

FuntastyKit.xcodeproj/xcshareddata/xcschemes/FuntastyKit-tvOS.xcscheme

@@ -156,7 +156,7 @@ public extension TabBarItemCoordinator {
         }
 
         var mutableViewControllers = viewControllers
-        if let index = mutableViewControllers.index(of: destinationNavigationController ?? viewController) {
+        if let index = mutableViewControllers.firstIndex(of: destinationNavigationController ?? viewController) {
             mutableViewControllers.remove(at: index)
         }
 

FuntastyKit.xcodeproj/xcshareddata/xcschemes/FuntastyKit-watchOS.xcscheme

@@ -1,7 +1,7 @@
 /**
  *  FuntastyKit
  *
- *  Copyright (c) 2016 Petr Zvonicek. Licensed under the MIT license, as follows:
+ *  Copyright (c) 2019 FUNTASTY Digital s.r.o. Licensed under the MIT license, as follows:
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal