From 4f4105d51389ba754171e4397690a055d5d23cea Mon Sep 17 00:00:00 2001 From: Arthur Ariel Sabintsev Date: Wed, 9 Nov 2016 20:16:59 -0500 Subject: [PATCH] Updated Podspec and Gemfile --- CONTRIBUTORS.md | 2 ++ Gemfile.lock | 40 +++++++++++++----------- Sample App/.DS_Store | Bin 6148 -> 6148 bytes Sample App/Sample App/AppDelegate.swift | 2 +- Siren.podspec | 2 +- Siren/Siren.swift | 5 ++- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0616b13d..1b8c460a 100755 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -27,6 +27,8 @@ - [thii](https://github.com/ilijapuaca) for [Pull Request #83](https://github.com/ArtSabintsev/Siren/pull/83) - [Kristaps Grinbergs](https://github.com/fassko) for [Pull Request #90](https://github.com/ArtSabintsev/Siren/pull/90) - [Luciano Nascimento](https://github.com/@lucianocn) for [Pull Request #146 (Harpy)](https://github.com/ArtSabintsev/Harpy/pull/146) +- [Stefan Kieleithner](https://github.com/steviki) for [Pull Request #97](https://github.com/ArtSabintsev/Siren/pull/97) +- [Vladislav Jevremović](https://github.com/VladislavJevremovic) for [Pull Request #98](https://github.com/ArtSabintsev/Siren/pull/98) ### Harpy Project Contributors This repo is a Swift language port of [Harpy](http://github.com/ArtSabintsev/Harpy). We couldn't have built this port without acknowledging the following developers who were instrumental in getting Harpy to v3.2.1, the version of Harpy that Siren was based on. diff --git a/Gemfile.lock b/Gemfile.lock index 169b4219..36a2df0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,69 +1,73 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.3) activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (1.0.0) - cocoapods (1.1.0.rc.2) + claide (1.0.1) + cocoapods (1.1.1) activesupport (>= 4.0.2, < 5) - claide (>= 1.0.0, < 2.0) - cocoapods-core (= 1.1.0.rc.2) + claide (>= 1.0.1, < 2.0) + cocoapods-core (= 1.1.1) cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.1, < 2.0) + cocoapods-downloader (>= 1.1.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.1.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) - fourflusher (~> 1.0.1) + fourflusher (~> 2.0.1) gh_inspector (~> 1.0) molinillo (~> 0.5.1) nap (~> 1.0) - xcodeproj (>= 1.3.1, < 2.0) - cocoapods-core (1.1.0.rc.2) + xcodeproj (>= 1.3.3, < 2.0) + cocoapods-core (1.1.1) activesupport (>= 4.0.2, < 5) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.1) + cocoapods-downloader (1.1.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.0.0) - cocoapods-trunk (1.0.0) + cocoapods-trunk (1.1.1) nap (>= 0.8, < 2.0) netrc (= 0.7.8) cocoapods-try (1.1.0) colored (1.2) escape (0.0.4) - fourflusher (1.0.1) + fourflusher (2.0.1) fuzzy_match (2.0.4) gh_inspector (1.0.2) i18n (0.7.0) json (1.8.3) - minitest (5.9.0) - molinillo (0.5.1) + minitest (5.9.1) + molinillo (0.5.3) + nanaimo (0.2.2) nap (1.1.0) netrc (0.7.8) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (1.3.1) + xcodeproj (1.4.1) + CFPropertyList (~> 2.3.3) activesupport (>= 3) - claide (>= 1.0.0, < 2.0) + claide (>= 1.0.1, < 2.0) colored (~> 1.2) + nanaimo (~> 0.2.0) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.1.0.rc.2) + cocoapods (= 1.1.1) BUNDLED WITH - 1.13.0 + 1.13.6 diff --git a/Sample App/.DS_Store b/Sample App/.DS_Store index b3079191f606e21eab6401d5ff65c973a71579cc..2c06a63dae23e32f5acf670c4d63c4543feff141 100644 GIT binary patch delta 104 zcmZoMXfc=|#>B)qu~2NHo+2ab#DLw41(+CFSs54@xF!oQitv;L7v<&T=cNM$7$+ZK z)R}C-$j7wnG?-b!*viPbnUU!w%Vu^Ceh#2HK+bpO$^0Ug9E?EqKs^kb14Onk0{}`` B7>)n{ delta 80 zcmZoMXfc=|#>B`mu~2NHo+2a5#DLw5ERzkGteAGb1yVYbXE3!gF?`sp$o!0DV}lyw gW_AvK4xoCVz<1`!{34bd3_!rhz`(RQKx7Lu0FLPtiU0rr diff --git a/Sample App/Sample App/AppDelegate.swift b/Sample App/Sample App/AppDelegate.swift index d0fc4fe4..26a1ce16 100755 --- a/Sample App/Sample App/AppDelegate.swift +++ b/Sample App/Sample App/AppDelegate.swift @@ -42,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { siren.patchUpdateAlertType = .option siren.revisionUpdateAlertType = .option - // Optional - Sets all messages to appear in Spanish. Siren supports many other languages, not just English and Spanish. + // Optional - Sets all messages to appear in Spanish. Siren supports many other languages, not just English and Russian. // siren.forceLanguageLocalization = .Russian // Required diff --git a/Siren.podspec b/Siren.podspec index f43e2d4d..6699ae96 100755 --- a/Siren.podspec +++ b/Siren.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Siren" - s.version = "1.0.3" + s.version = "1.0.4" s.summary = "Notify users when a new version of your iOS app is available, and prompt them with the App Store link.." s.description = <<-DESC diff --git a/Siren/Siren.swift b/Siren/Siren.swift index 6721a2a8..ee4345af 100644 --- a/Siren/Siren.swift +++ b/Siren/Siren.swift @@ -696,7 +696,10 @@ fileprivate extension Bundle { } func bestMatchingAppName() -> String { - return (Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String) ?? (Bundle.main.object(forInfoDictionaryKey: kCFBundleNameKey as String) as? String) ?? "" + let bundleDisplayName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String + let bundleName = Bundle.main.object(forInfoDictionaryKey: kCFBundleNameKey as String) as? String + + return bundleDisplayName ?? bundleName ?? "" } }