Skip to content

Commit 3f46e16

Browse files
authored
Merge pull request #196 from SeanAsby/feature/Swift5
Updated project with latest dependencies and Swift 5
2 parents 5bae665 + 681745d commit 3f46e16

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# A scolling drop-in replacement for UILabel for long texts.
2-
github "cbpowell/MarqueeLabel" ~> 3.0
2+
github "cbpowell/MarqueeLabel" ~> 3.2.1
33

44
# A Swift Autolayout DSL for iOS & OS X
5-
github "SnapKit/SnapKit" ~> 4.0.0
5+
github "SnapKit/SnapKit" ~> 4.2.0

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "SnapKit/SnapKit" "4.0.1"
2-
github "cbpowell/MarqueeLabel" "3.2.0"
1+
github "SnapKit/SnapKit" "4.2.0"
2+
github "cbpowell/MarqueeLabel" "3.2.1"

NotificationBanner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
developmentRegion = English;
187187
hasScannedForEncodings = 0;
188188
knownRegions = (
189+
English,
189190
en,
190191
);
191192
mainGroup = 823255811EB872AB006F95C3;
@@ -352,7 +353,7 @@
352353
PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
353354
PRODUCT_NAME = "$(TARGET_NAME)";
354355
SKIP_INSTALL = YES;
355-
SWIFT_VERSION = 4.2;
356+
SWIFT_VERSION = 5.0;
356357
};
357358
name = Debug;
358359
};
@@ -376,7 +377,7 @@
376377
PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
377378
PRODUCT_NAME = "$(TARGET_NAME)";
378379
SKIP_INSTALL = YES;
379-
SWIFT_VERSION = 4.2;
380+
SWIFT_VERSION = 5.0;
380381
};
381382
name = Release;
382383
};

NotificationBanner/Classes/BaseNotificationBanner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public class BaseNotificationBanner: UIView {
138138
private(set) var bannerPosition: BannerPosition!
139139

140140
/// The notification banner sides edges insets from superview. If presented - spacerView color will be transparent
141-
internal(set) var bannerEdgeInsets: UIEdgeInsets? = nil {
141+
internal var bannerEdgeInsets: UIEdgeInsets? = nil {
142142
didSet {
143143
if bannerEdgeInsets != nil {
144144
spacerView.backgroundColor = .clear

NotificationBanner/Classes/NotificationBannerQueue.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ open class NotificationBannerQueue: NSObject {
4949
if queuePosition == .back {
5050
banners.append(banner)
5151

52-
if banners.index(of: banner) == 0 {
52+
if banners.firstIndex(of: banner) == 0 {
5353
banner.show(placeOnQueue: false, bannerPosition: banner.bannerPosition)
5454
}
5555

NotificationBannerSwift.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ NotificationBanner is an extremely customizable and lightweight library that mak
1212
s.license = { :type => 'MIT', :file => 'LICENSE' }
1313
s.author = { 'Daltron' => 'daltonhint4@gmail.com' }
1414
s.source = { :git => 'https://github.com/Daltron/NotificationBanner.git', :tag => s.version.to_s }
15-
15+
1616
s.ios.deployment_target = '9.0'
17-
s.swift_version = '4.2'
17+
s.swift_version = '5.0'
1818
s.source_files = 'NotificationBanner/Classes/**/*'
1919

2020
s.dependency 'SnapKit', '~> 4.2.0'
21-
s.dependency 'MarqueeLabel/Swift', '~> 3.2.0'
21+
s.dependency 'MarqueeLabel/Swift', '~> 3.2.1'
2222

2323
end

0 commit comments

Comments
 (0)