Merge pull request #85 from Yalantis/pv-31-03

Pv 31 03
Yalantis · Apr 9, 2020 · 0dac15a · 0dac15a
2 parents 7a62bbd + b6e16ad
commit 0dac15a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 24 deletions.
diff --git a/ColorMatchTabs.podspec b/ColorMatchTabs.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name             = "ColorMatchTabs"
-  s.version          = "3.3"
+  s.version          = "3.4"
   s.summary          = "UI animation concept fo review apps."
 
   s.homepage         = "https://github.com/Yalantis/ColorMatchTabs"

diff --git a/ColorMatchTabs.xcodeproj/project.pbxproj b/ColorMatchTabs.xcodeproj/project.pbxproj
@@ -191,18 +191,18 @@
 		C52988FD1D4630440058C829 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1120;
 				ORGANIZATIONNAME = Yalantis;
 				TargetAttributes = {
 					C52989051D4630440058C829 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0940;
+						LastSwiftMigration = 1120;
 					};
 				};
 			};
 			buildConfigurationList = C52989001D4630440058C829 /* Build configuration list for PBXProject "ColorMatchTabs" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -306,7 +306,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -359,7 +359,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -382,7 +382,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -401,7 +401,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/ColorMatchTabs.xcodeproj/xcshareddata/xcschemes/ColorMatchTabs.xcscheme b/ColorMatchTabs.xcodeproj/xcshareddata/xcschemes/ColorMatchTabs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ColorMatchTabs.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/ColorMatchTabs/Classes/Views/ColorTabs.swift b/ColorMatchTabs/Classes/Views/ColorTabs.swift
@@ -194,7 +194,7 @@ private extension ColorTabs {
 
     @objc
     func selectButton(_ sender: UIButton) {
-        if let index = buttons.index(of: sender) {
+        if let index = buttons.firstIndex(of: sender) {
             selectedSegmentIndex = index
         }
     }

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -389,7 +389,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -438,7 +438,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -454,7 +454,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.yalantis.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -469,7 +469,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.yalantis.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Example/Classes/ViewControllers/ExampleViewContoller.swift b/Example/Example/Classes/ViewControllers/ExampleViewContoller.swift
@@ -17,6 +17,7 @@ class ExampleViewContoller: ColorMatchTabsViewController {
         titleLabel.font = UIFont.navigationTitleFont()
         // to hide bottom button remove the following line
         popoverViewController = ExamplePopoverViewController()
+        popoverViewController?.modalPresentationStyle = .fullScreen
         popoverViewController?.delegate = self
 
         colorMatchTabDataSource = self

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ColorMatchTabs (3.2)
+  - ColorMatchTabs (3.3)
 
 DEPENDENCIES:
   - ColorMatchTabs (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ColorMatchTabs: b0b9a1e54348289f40e92947ebe75f90fe5eee21
+  ColorMatchTabs: 8d63cd25099bdb8929438f468bb52aafd288d7a0
 
 PODFILE CHECKSUM: ab163ed25fc44cbc1d4ce0c5359c7f321abd68de
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.4
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Yalantis
+Copyright (c) 2020 Yalantis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ColorMatchTabs
 
 ![cocoapods](https://img.shields.io/cocoapods/v/ColorMatchTabs.svg)
-![Swift 4](https://img.shields.io/badge/Swift-4.x-orange.svg)
+![Swift 5](https://img.shields.io/badge/Swift-5.x-orange.svg)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/ColorMatchTabs.svg)](https://img.shields.io/cocoapods/v/GuillotineMenu.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
@@ -78,7 +78,7 @@ P.S. We’re going to publish more awesomeness wrapped in code and a tutorial on
 
 The MIT License (MIT)
 
-Copyright (c) 2019 Yalantis
+Copyright (c) 2020 Yalantis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal