Skip to content

Commit f9184ae

Browse files
authored
Merge pull request #203 from ben9923/update-dependencies
Update dependencies & project settings
2 parents 08dfb9a + ec2f25c commit f9184ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1223
-1155
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

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.2.1
2+
github "cbpowell/MarqueeLabel" ~> 4.0.0
33

44
# A Swift Autolayout DSL for iOS & OS X
5-
github "SnapKit/SnapKit" ~> 4.2.0
5+
github "SnapKit/SnapKit" ~> 5.0.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.2.0"
2-
github "cbpowell/MarqueeLabel" "3.2.1"
1+
github "SnapKit/SnapKit" "5.0.0"
2+
github "cbpowell/MarqueeLabel" "4.0.0"

Example/NotificationBanner.xcodeproj/project.pbxproj

Lines changed: 10 additions & 168 deletions
Large diffs are not rendered by default.

Example/Podfile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
use_frameworks!
2-
platform :ios, '9.0'
2+
platform :ios, '10.0'
33

44
target 'NotificationBanner_Example' do
55
pod 'NotificationBannerSwift', :path => '../'
66
pod 'Reveal-iOS-SDK', :configurations => ['Debug']
77

88
target 'NotificationBanner_Tests' do
99
inherit! :search_paths
10-
11-
1210
end
1311
end
14-
15-
post_install do |installer|
16-
installer.pods_project.targets.each do |target|
17-
swift4_projects = ['MarqueeLabel']
18-
if swift4_projects.include? target.name
19-
target.build_configurations.each do |config|
20-
config.build_settings['SWIFT_VERSION'] = '4.2'
21-
end
22-
end
23-
end
24-
end

Example/Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- MarqueeLabel/Swift (3.2.0)
3-
- NotificationBannerSwift (1.7.1):
4-
- MarqueeLabel/Swift (~> 3.2.0)
5-
- SnapKit (~> 4.0.1)
2+
- MarqueeLabel (4.0.0)
3+
- NotificationBannerSwift (2.1.0):
4+
- MarqueeLabel (~> 4.0.0)
5+
- SnapKit (~> 5.0.0)
66
- Reveal-iOS-SDK (1.6.2)
7-
- SnapKit (4.0.1)
7+
- SnapKit (5.0.0)
88

99
DEPENDENCIES:
1010
- NotificationBannerSwift (from `../`)
@@ -21,11 +21,11 @@ EXTERNAL SOURCES:
2121
:path: "../"
2222

2323
SPEC CHECKSUMS:
24-
MarqueeLabel: 440a502b91a9179bd98f9fff00ba1150650a1c0e
25-
NotificationBannerSwift: c6f21a8ea856722cf910a808c087092f0c9ccd7f
24+
MarqueeLabel: b55b26e690b6ad41faedd95cbf5eae6f1d1735b4
25+
NotificationBannerSwift: cc8fc633c3119577a5dd06b8b7774abffdef9cb0
2626
Reveal-iOS-SDK: e2250b3c155bcfac53ae223ddc1f76d08f206c33
27-
SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
27+
SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
2828

29-
PODFILE CHECKSUM: 5ddf90d4952f980c741f9d7226c2827f0b2d1b95
29+
PODFILE CHECKSUM: 5df8d90f64b2772af127cf73f052ed06aca4d4ea
3030

31-
COCOAPODS: 1.5.3
31+
COCOAPODS: 1.6.1

Example/Pods/Local Podspecs/NotificationBannerSwift.podspec.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/MarqueeLabel/README.mdown

Lines changed: 11 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/MarqueeLabel/Sources/Swift/MarqueeLabel.swift renamed to Example/Pods/MarqueeLabel/Sources/MarqueeLabel.swift

Lines changed: 24 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)