Merge pull request #196 from SeanAsby/feature/Swift5

Updated project with latest dependencies and Swift 5
Daltron · Apr 5, 2019 · 3f46e16 · 3f46e16
2 parents 5bae665 + 681745d
commit 3f46e16
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,5 +1,5 @@
 # A scolling drop-in replacement for UILabel for long texts.
-github "cbpowell/MarqueeLabel" ~> 3.0
+github "cbpowell/MarqueeLabel" ~> 3.2.1
 
 # A Swift Autolayout DSL for iOS & OS X
-github "SnapKit/SnapKit" ~> 4.0.0
+github "SnapKit/SnapKit" ~> 4.2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "SnapKit/SnapKit" "4.0.1"
-github "cbpowell/MarqueeLabel" "3.2.0"
+github "SnapKit/SnapKit" "4.2.0"
+github "cbpowell/MarqueeLabel" "3.2.1"
diff --git a/NotificationBanner.xcodeproj/project.pbxproj b/NotificationBanner.xcodeproj/project.pbxproj
@@ -186,6 +186,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 823255811EB872AB006F95C3;
@@ -352,7 +353,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -376,7 +377,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/NotificationBanner/Classes/BaseNotificationBanner.swift b/NotificationBanner/Classes/BaseNotificationBanner.swift
@@ -138,7 +138,7 @@ public class BaseNotificationBanner: UIView {
     private(set) var bannerPosition: BannerPosition!
 
     /// The notification banner sides edges insets from superview. If presented - spacerView color will be transparent
-    internal(set) var bannerEdgeInsets: UIEdgeInsets? = nil {
+    internal var bannerEdgeInsets: UIEdgeInsets? = nil {
         didSet {
             if bannerEdgeInsets != nil {
                 spacerView.backgroundColor = .clear

diff --git a/NotificationBanner/Classes/NotificationBannerQueue.swift b/NotificationBanner/Classes/NotificationBannerQueue.swift
@@ -49,7 +49,7 @@ open class NotificationBannerQueue: NSObject {
         if queuePosition == .back {
             banners.append(banner)
 
-            if banners.index(of: banner) == 0 {
+            if banners.firstIndex(of: banner) == 0 {
                 banner.show(placeOnQueue: false, bannerPosition: banner.bannerPosition)
             }
 

diff --git a/NotificationBannerSwift.podspec b/NotificationBannerSwift.podspec
@@ -12,12 +12,12 @@ NotificationBanner is an extremely customizable and lightweight library that mak
     s.license          = { :type => 'MIT', :file => 'LICENSE' }
     s.author           = { 'Daltron' => 'daltonhint4@gmail.com' }
     s.source           = { :git => 'https://github.com/Daltron/NotificationBanner.git', :tag => s.version.to_s }
-   
+
     s.ios.deployment_target = '9.0'
-    s.swift_version = '4.2'
+    s.swift_version = '5.0'
     s.source_files = 'NotificationBanner/Classes/**/*'
 
     s.dependency 'SnapKit', '~> 4.2.0'
-    s.dependency 'MarqueeLabel/Swift', '~> 3.2.0'
+    s.dependency 'MarqueeLabel/Swift', '~> 3.2.1'
 
 end