Merge branch 'feature/swift-5.0-support' into develop

# Conflicts: # Example/Podfile # Example/Podfile.lock # Example/iStatusView.xcodeproj/project.pbxproj # Example/iStatusView/ViewController.swift # iStatusView.podspec
NextFaze · Jul 27, 2020 · 5429f47 · 5429f47
2 parents 0f10d38 + 707552f
commit 5429f47
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 37 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,4 +1,3 @@
-platform :ios, '10.0'
 use_frameworks!
 
 target 'iStatusView_Example' do
@@ -9,9 +8,9 @@ target 'iStatusView_Example' do
   target 'iStatusView_Tests' do
     inherit! :search_paths
 
-    pod 'Quick', '~> 1.2.0'
+    pod 'Quick', '~> 3.0'
     pod 'Nimble', '~> 8.0'
     pod 'FBSnapshotTestCase' , '~> 2.1.4'
-    pod 'Nimble-Snapshots' , '~> 7.0'
+    pod 'Nimble-Snapshots' , '~> 8.2'
   end
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -4,33 +4,33 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - iOSSnapshotTestCase (6.0.2):
-    - iOSSnapshotTestCase/SwiftSupport (= 6.0.2)
-  - iOSSnapshotTestCase/Core (6.0.2)
-  - iOSSnapshotTestCase/SwiftSupport (6.0.2):
+  - iOSSnapshotTestCase (6.2.0):
+    - iOSSnapshotTestCase/SwiftSupport (= 6.2.0)
+  - iOSSnapshotTestCase/Core (6.2.0)
+  - iOSSnapshotTestCase/SwiftSupport (6.2.0):
     - iOSSnapshotTestCase/Core
-  - iStatusView (0.3.1)
-  - Nimble (8.0.1)
-  - Nimble-Snapshots (7.0.0):
-    - Nimble-Snapshots/Core (= 7.0.0)
-  - Nimble-Snapshots/Core (7.0.0):
+  - iStatusView (0.4.0)
+  - Nimble (8.1.1)
+  - Nimble-Snapshots (8.2.1):
+    - Nimble-Snapshots/Core (= 8.2.1)
+  - Nimble-Snapshots/Core (8.2.1):
     - iOSSnapshotTestCase (~> 6.0)
     - Nimble (~> 8.0)
-  - Quick (1.2.0)
-  - SnapKit (4.2.0)
+  - Quick (3.0.0)
+  - SnapKit (5.0.1)
   - SVProgressHUD (2.2.5)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (~> 2.1.4)
   - iStatusView (from `../`)
   - Nimble (~> 8.0)
-  - Nimble-Snapshots (~> 7.0)
-  - Quick (~> 1.2.0)
+  - Nimble-Snapshots (~> 8.2)
+  - Quick (~> 3.0)
   - SnapKit
   - SVProgressHUD
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - FBSnapshotTestCase
     - iOSSnapshotTestCase
     - Nimble
@@ -45,14 +45,14 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
-  iStatusView: 4b774171417a9636a8d2e3a0ada6575fec647d59
-  Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
-  Nimble-Snapshots: 2d6d712ceb2d1850d88f850fbd7c732618106022
-  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
+  iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
+  iStatusView: 6814dde50423d68fb1755408c9616c5f0229e758
+  Nimble: 5f8a2fb6fa343a7242dfdd9d42f7267419d464b2
+  Nimble-Snapshots: 3a4750d83752625c8ebfdc588da105303ee2201e
+  Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
+  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
 
-PODFILE CHECKSUM: d5321adb1d9cb08c8c51a7a80181f20b1131ee59
+PODFILE CHECKSUM: eeb5fc88f8168260d028ee9d3aeee0199038d0b0
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.9.3
diff --git a/Example/iStatusView.xcodeproj/project.pbxproj b/Example/iStatusView.xcodeproj/project.pbxproj
@@ -210,11 +210,11 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1160;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1160;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -431,7 +431,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -479,7 +479,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -499,7 +499,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -515,7 +515,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -537,7 +537,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -555,7 +555,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/iStatusView/ViewController.swift b/Example/iStatusView/ViewController.swift
@@ -148,7 +148,7 @@ class ViewController: UIViewController {
         button.setTitleColor(UIColor.black, for: .normal)
         button.layer.cornerRadius = 4.0
         button.layer.borderWidth = 1.0
-        button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
+        button.contentEdgeInsets = UIEdgeInsets.init(top: 5, left: 10, bottom: 5, right: 10)
         button.backgroundColor = UIColor.white
         button.addTarget(self, action: #selector(statusViewButtonPressed), for: .touchUpInside)
         self.view.addSubview(button)

diff --git a/iStatusView.podspec b/iStatusView.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'iStatusView'
-  s.version          = '0.3.1'
+  s.version          = '0.4.0'
   s.summary          = 'iStatusView is a convenient way to show loading and message status in a view.'
 
 # This description is used to generate tags and improve search results.
@@ -30,8 +30,8 @@ When an error has occured, the message can be displayed, and a rety button can b
   s.source           = { :git => 'https://github.com/NextFaze/iStatusView.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
-  s.ios.deployment_target = '9.3'
-  s.swift_version = '4.2'
+  s.ios.deployment_target = '10.0'
+  s.swift_version = '5.0'
 
   s.source_files = 'iStatusView/Classes/**/*'