-
-
Notifications
You must be signed in to change notification settings - Fork 664
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Daltron/NotificationBanner
- Loading branch information
Showing
41 changed files
with
1,235 additions
and
1,158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# A scolling drop-in replacement for UILabel for long texts. | ||
github "cbpowell/MarqueeLabel" ~> 3.2.1 | ||
github "cbpowell/MarqueeLabel" ~> 4.0.0 | ||
|
||
# A Swift Autolayout DSL for iOS & OS X | ||
github "SnapKit/SnapKit" ~> 4.2.0 | ||
github "SnapKit/SnapKit" ~> 5.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
github "SnapKit/SnapKit" "4.2.0" | ||
github "cbpowell/MarqueeLabel" "3.2.1" | ||
github "SnapKit/SnapKit" "5.0.0" | ||
github "cbpowell/MarqueeLabel" "4.0.0" |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,11 @@ | ||
use_frameworks! | ||
platform :ios, '9.0' | ||
platform :ios, '10.0' | ||
|
||
target 'NotificationBanner_Example' do | ||
pod 'NotificationBannerSwift', :path => '../' | ||
pod 'Reveal-iOS-SDK', :configurations => ['Debug'] | ||
|
||
target 'NotificationBanner_Tests' do | ||
inherit! :search_paths | ||
|
||
|
||
end | ||
end | ||
|
||
post_install do |installer| | ||
installer.pods_project.targets.each do |target| | ||
swift4_projects = ['MarqueeLabel'] | ||
if swift4_projects.include? target.name | ||
target.build_configurations.each do |config| | ||
config.build_settings['SWIFT_VERSION'] = '4.2' | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 7 additions & 6 deletions
13
Example/Pods/Local Podspecs/NotificationBannerSwift.podspec.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
38 changes: 24 additions & 14 deletions
38
...ueeLabel/Sources/Swift/MarqueeLabel.swift → ...s/MarqueeLabel/Sources/MarqueeLabel.swift
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.