From b6d1c1007f9e0adbff7d5246c04fc64ba350be64 Mon Sep 17 00:00:00 2001 From: sgr-ksmt Date: Wed, 9 May 2018 20:46:53 +0900 Subject: [PATCH 1/2] upgrade to firebase v5.0.0. --- Lobster.xcodeproj/project.pbxproj | 16 ------- Podfile.lock | 80 ++++++++++++++++++------------- Sources/Lobster.swift | 3 +- 3 files changed, 48 insertions(+), 51 deletions(-) diff --git a/Lobster.xcodeproj/project.pbxproj b/Lobster.xcodeproj/project.pbxproj index 838278b..2f2cb90 100644 --- a/Lobster.xcodeproj/project.pbxproj +++ b/Lobster.xcodeproj/project.pbxproj @@ -119,7 +119,6 @@ 163143FB1FA8BE8600D25996 /* Frameworks */, 163143FC1FA8BE8600D25996 /* Headers */, 163143FD1FA8BE8600D25996 /* Resources */, - B118D601A6676BA70437901B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -192,21 +191,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - B118D601A6676BA70437901B /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lobster/Pods-Lobster-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Podfile.lock b/Podfile.lock index 13f5a79..ab7dc5f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,32 +1,34 @@ PODS: - - Firebase/Core (4.13.0): - - FirebaseAnalytics (= 4.2.0) - - FirebaseCore (= 4.0.20) - - Firebase/RemoteConfig (4.13.0): + - Firebase/Core (5.0.0): + - Firebase/CoreOnly + - FirebaseAnalytics (= 5.0.0) + - Firebase/CoreOnly (5.0.0): + - FirebaseCore (= 5.0.0) + - Firebase/RemoteConfig (5.0.0): - Firebase/Core - - FirebaseRemoteConfig (= 2.1.3) - - FirebaseABTesting (1.0.0): - - FirebaseCore (~> 4.0) - - Protobuf (~> 3.1) - - FirebaseAnalytics (4.2.0): - - FirebaseCore (~> 4.0) - - FirebaseInstanceID (~> 2.0) - - GoogleToolboxForMac/NSData+zlib (~> 2.1) + - FirebaseRemoteConfig (= 3.0.0) + - FirebaseABTesting (2.0.0): + - FirebaseCore (~> 5.0) + - Protobuf (~> 3.5) + - FirebaseAnalytics (5.0.0): + - FirebaseCore (~> 5.0) + - FirebaseInstanceID (~> 3.0) + - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - nanopb (~> 0.3) - - FirebaseCore (4.0.20): - - GoogleToolboxForMac/NSData+zlib (~> 2.1) - - FirebaseInstanceID (2.0.10): - - FirebaseCore (~> 4.0) - - FirebaseRemoteConfig (2.1.3): - - FirebaseABTesting (~> 1.0) - - FirebaseAnalytics (~> 4.1) - - FirebaseCore (~> 4.0) - - FirebaseInstanceID (~> 2.0) - - GoogleToolboxForMac/NSData+zlib (~> 2.1) + - FirebaseCore (5.0.0): + - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" + - FirebaseInstanceID (3.0.0): + - FirebaseCore (~> 5.0) + - FirebaseRemoteConfig (3.0.0): + - FirebaseABTesting (~> 2.0) + - FirebaseAnalytics (~> 5.0) + - FirebaseCore (~> 5.0) + - FirebaseInstanceID (~> 3.0) + - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - Protobuf (~> 3.5) - - GoogleToolboxForMac/Defines (2.1.3) - - GoogleToolboxForMac/NSData+zlib (2.1.3): - - GoogleToolboxForMac/Defines (= 2.1.3) + - GoogleToolboxForMac/Defines (2.1.4) + - "GoogleToolboxForMac/NSData+zlib (2.1.4)": + - GoogleToolboxForMac/Defines (= 2.1.4) - nanopb (0.3.8): - nanopb/decode (= 0.3.8) - nanopb/encode (= 0.3.8) @@ -37,17 +39,29 @@ PODS: DEPENDENCIES: - Firebase/RemoteConfig +SPEC REPOS: + https://github.com/CocoaPods/Specs.git: + - Firebase + - FirebaseABTesting + - FirebaseAnalytics + - FirebaseCore + - FirebaseInstanceID + - FirebaseRemoteConfig + - GoogleToolboxForMac + - nanopb + - Protobuf + SPEC CHECKSUMS: - Firebase: 5ec5e863d269d82d66b4bf56856726f8fb8f0fb3 - FirebaseABTesting: d07d0ee833b842d5153549e4c7e2e2cb1c23a3f9 - FirebaseAnalytics: 7ef69e76a5142f643aeb47c780e1cdce4e23632e - FirebaseCore: 90cb1c53d69b556f112a1bf72b5fcfaad7650790 - FirebaseInstanceID: 8d20d890d65c917f9f7d9950b6e10a760ad34321 - FirebaseRemoteConfig: 3e95fb7c072308492e85fa41d59d38b3d6fd2372 - GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20 + Firebase: 4bd804448ab2596794698773d41520a0af101e65 + FirebaseABTesting: 1f50b8d50f5e3469eea54e7463a7b7fe221d1f5e + FirebaseAnalytics: 19812b49fa5f283dd6b23edf8a14b5d477029ab8 + FirebaseCore: e46e4babb9de298fb2f736958edcc6da1dc60d73 + FirebaseInstanceID: 83e0040351565df711a5db3d8ebe5ea21aca998a + FirebaseRemoteConfig: 3c57e4644bd6976b671ae0b725cd709f198bd1f5 + GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03 PODFILE CHECKSUM: a0ac64af65ccc2a1ef76137a9390274ee3d1190c -COCOAPODS: 1.4.0 +COCOAPODS: 1.5.0 diff --git a/Sources/Lobster.swift b/Sources/Lobster.swift index b1e8aab..21b0d98 100644 --- a/Sources/Lobster.swift +++ b/Sources/Lobster.swift @@ -23,8 +23,7 @@ public class Lobster { /// NOTE: It must be false on production. public var debugMode: Bool = false { didSet { - guard let settings = RemoteConfigSettings(developerModeEnabled: debugMode) else { return } - RemoteConfig.remoteConfig().configSettings = settings + RemoteConfig.remoteConfig().configSettings = RemoteConfigSettings(developerModeEnabled: debugMode) } } public private(set) var fetchStatus: RemoteConfigFetchStatus = .noFetchYet From 445097abd517f56b3d06ffb7c10eed7300f71bfa Mon Sep 17 00:00:00 2001 From: sgr-ksmt Date: Wed, 9 May 2018 21:35:20 +0900 Subject: [PATCH 2/2] lock firebase remote config version to 5.0.0. --- Podfile | 4 ++-- Podfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile b/Podfile index 10cb9d1..1b08dd5 100644 --- a/Podfile +++ b/Podfile @@ -4,5 +4,5 @@ inhibit_all_warnings! use_frameworks! target 'Lobster' do - pod 'Firebase/RemoteConfig' -end \ No newline at end of file + pod 'Firebase/RemoteConfig', '~> 5.0.0' +end diff --git a/Podfile.lock b/Podfile.lock index ab7dc5f..4f809b7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -37,7 +37,7 @@ PODS: - Protobuf (3.5.0) DEPENDENCIES: - - Firebase/RemoteConfig + - Firebase/RemoteConfig (~> 5.0.0) SPEC REPOS: https://github.com/CocoaPods/Specs.git: @@ -62,6 +62,6 @@ SPEC CHECKSUMS: nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03 -PODFILE CHECKSUM: a0ac64af65ccc2a1ef76137a9390274ee3d1190c +PODFILE CHECKSUM: 3e07d748825a2698d174c6e93e5aabe6b9da49db COCOAPODS: 1.5.0