diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2018-05-08 10:59:19 -0700 |
---|---|---|
committer | Paul Beusterien <paulbeusterien@google.com> | 2018-05-08 10:59:19 -0700 |
commit | bb8c87a02897da363f23dbc1f5193551158cef41 (patch) | |
tree | aff4dd5ab0f4c6189577af31bbd023f33b9f818e | |
parent | dddd75037ddd0937f2526ae7b43b62f571b22f49 (diff) | |
parent | 56a529531b5ecd81a68c098ec8fbc5b8a6ec3fcf (diff) |
merge
-rw-r--r-- | Example/Analytics_Tests_iOS/Analytics_Tests_iOS.m | 39 | ||||
-rw-r--r-- | Example/Analytics_Tests_iOS/DeprecatedHeaderTest.m | 21 | ||||
-rw-r--r-- | Example/Analytics_Tests_iOS/Info.plist | 22 | ||||
-rw-r--r-- | Example/Firebase.xcodeproj/project.pbxproj | 148 | ||||
-rw-r--r-- | Example/Firebase.xcodeproj/xcshareddata/xcschemes/Analytics_Tests_iOS.xcscheme | 58 | ||||
-rw-r--r-- | Example/Podfile | 19 | ||||
-rw-r--r-- | FirebaseAuth.podspec | 11 | ||||
-rw-r--r-- | FirebaseCore.podspec | 10 | ||||
-rw-r--r-- | FirebaseDatabase.podspec | 11 | ||||
-rw-r--r-- | FirebaseFirestore.podspec | 21 | ||||
-rw-r--r-- | FirebaseFunctions.podspec | 18 | ||||
-rw-r--r-- | FirebaseMessaging.podspec | 12 | ||||
-rw-r--r-- | FirebaseStorage.podspec | 11 | ||||
-rw-r--r-- | Firestore/Example/Podfile | 7 | ||||
-rw-r--r-- | README.md | 50 | ||||
-rw-r--r-- | patch/FirebaseAnalytics.h | 25 | ||||
-rwxr-xr-x | scripts/push-pods.sh | 41 | ||||
-rwxr-xr-x | scripts/update-tags.sh | 61 |
18 files changed, 173 insertions, 412 deletions
diff --git a/Example/Analytics_Tests_iOS/Analytics_Tests_iOS.m b/Example/Analytics_Tests_iOS/Analytics_Tests_iOS.m deleted file mode 100644 index a020433..0000000 --- a/Example/Analytics_Tests_iOS/Analytics_Tests_iOS.m +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2017 Google -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#import <XCTest/XCTest.h> - -@interface Analytics_Tests_iOS : XCTestCase - -@end - -@implementation Analytics_Tests_iOS - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the - // class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the - // class. - [super tearDown]; -} - -- (void)testExample { - // Replace with a real test if we ever want to do Analytics unit tests here. -} - -@end diff --git a/Example/Analytics_Tests_iOS/DeprecatedHeaderTest.m b/Example/Analytics_Tests_iOS/DeprecatedHeaderTest.m deleted file mode 100644 index 6d13042..0000000 --- a/Example/Analytics_Tests_iOS/DeprecatedHeaderTest.m +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017 Google -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Verify deprecated headers still exist. This file should be deleted at -// at the next major release when the headers are removed. - -#import <FirebaseAnalytics/FIRAnalyticsConfiguration.h> -#import <FirebaseAnalytics/FIRApp.h> -#import <FirebaseAnalytics/FIRConfiguration.h> -#import <FirebaseAnalytics/FIROptions.h> diff --git a/Example/Analytics_Tests_iOS/Info.plist b/Example/Analytics_Tests_iOS/Info.plist deleted file mode 100644 index 6c40a6c..0000000 --- a/Example/Analytics_Tests_iOS/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>$(DEVELOPMENT_LANGUAGE)</string> - <key>CFBundleExecutable</key> - <string>$(EXECUTABLE_NAME)</string> - <key>CFBundleIdentifier</key> - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>$(PRODUCT_NAME)</string> - <key>CFBundlePackageType</key> - <string>BNDL</string> - <key>CFBundleShortVersionString</key> - <string>1.0</string> - <key>CFBundleVersion</key> - <string>1</string> -</dict> -</plist> diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj index 23a0ca7..f924ed4 100644 --- a/Example/Firebase.xcodeproj/project.pbxproj +++ b/Example/Firebase.xcodeproj/project.pbxproj @@ -512,8 +512,6 @@ DEB61EC91E7C5DBB00C04B96 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEB61EC11E7C5DBB00C04B96 /* GoogleService-Info.plist */; }; DEB61ECB1E7C5DBB00C04B96 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DEB61EC31E7C5DBB00C04B96 /* main.m */; }; DECE039B1E9ED01600164CA4 /* FIRPhoneAuthProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DECE03991E9ECFF500164CA4 /* FIRPhoneAuthProviderTests.m */; }; - DEDFEFEF1FD1B8C100F7D466 /* Analytics_Tests_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = DEDFEFEE1FD1B8C100F7D466 /* Analytics_Tests_iOS.m */; }; - DEDFEFF71FD1B9AA00F7D466 /* DeprecatedHeaderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEDFEFF61FD1B9AA00F7D466 /* DeprecatedHeaderTest.m */; }; DEE14D7E1E844677006FA992 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DEE14D681E844677006FA992 /* LaunchScreen.storyboard */; }; DEE14D7F1E844677006FA992 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DEE14D6A1E844677006FA992 /* Main.storyboard */; }; DEE14D811E844677006FA992 /* FIRAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D6E1E844677006FA992 /* FIRAppDelegate.m */; }; @@ -809,13 +807,6 @@ remoteGlobalIDString = DE7B8D1C1E8EF078009EB6DF; remoteInfo = Database_Tests; }; - DEDFEFF11FD1B8C100F7D466 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6003F582195388D10070C39A /* Project object */; - proxyType = 1; - remoteGlobalIDString = DEE14D401E84464D006FA992; - remoteInfo = Core_Example_iOS; - }; DEE14D5A1E84464D006FA992 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6003F582195388D10070C39A /* Project object */; @@ -1239,10 +1230,6 @@ DEB61EC31E7C5DBB00C04B96 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; DEB61EC41E7C5DBB00C04B96 /* Storage-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Storage-Info.plist"; sourceTree = "<group>"; }; DECE03991E9ECFF500164CA4 /* FIRPhoneAuthProviderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRPhoneAuthProviderTests.m; sourceTree = "<group>"; }; - DEDFEFEC1FD1B8C100F7D466 /* Analytics_Tests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Analytics_Tests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DEDFEFEE1FD1B8C100F7D466 /* Analytics_Tests_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Analytics_Tests_iOS.m; sourceTree = "<group>"; }; - DEDFEFF01FD1B8C100F7D466 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; - DEDFEFF61FD1B9AA00F7D466 /* DeprecatedHeaderTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeprecatedHeaderTest.m; sourceTree = "<group>"; }; DEE14D411E84464D006FA992 /* Core_Example_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Core_Example_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; DEE14D591E84464D006FA992 /* Core_Tests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Core_Tests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; DEE14D691E844677006FA992 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; @@ -1512,13 +1499,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DEDFEFE91FD1B8C100F7D466 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DEE14D3E1E84464D006FA992 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1610,7 +1590,6 @@ DE9315B41E8738B70083EDBF /* Messaging */, AFC8BAA01EC24B1600B8EEAE /* Shared */, DEB139B31E734D9D00AC236D /* Storage */, - DEDFEFED1FD1B8C100F7D466 /* Analytics_Tests_iOS */, 6003F58C195388D20070C39A /* Frameworks */, 6003F58B195388D20070C39A /* Products */, ); @@ -1653,7 +1632,6 @@ DE1EC27F1FBA5E63007D18D8 /* Database_Tests_tvOS.xctest */, DE53893E1FBB62E100199FC2 /* Auth_Tests_tvOS.xctest */, DE1FAE901FBCF5E100897AAA /* Auth_Example_tvOS.app */, - DEDFEFEC1FD1B8C100F7D466 /* Analytics_Tests_iOS.xctest */, DE47C0ED207AC87D00B1AEDF /* Messaging_Sample_iOS.app */, ); name = Products; @@ -2260,16 +2238,6 @@ path = App; sourceTree = "<group>"; }; - DEDFEFED1FD1B8C100F7D466 /* Analytics_Tests_iOS */ = { - isa = PBXGroup; - children = ( - DEDFEFEE1FD1B8C100F7D466 /* Analytics_Tests_iOS.m */, - DEDFEFF01FD1B8C100F7D466 /* Info.plist */, - DEDFEFF61FD1B9AA00F7D466 /* DeprecatedHeaderTest.m */, - ); - path = Analytics_Tests_iOS; - sourceTree = "<group>"; - }; DEE14D661E844677006FA992 /* Core */ = { isa = PBXGroup; children = ( @@ -2904,24 +2872,6 @@ productReference = DEB13A231E73507E00AC236D /* Storage_Tests_iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - DEDFEFEB1FD1B8C100F7D466 /* Analytics_Tests_iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = DEDFEFF51FD1B8C100F7D466 /* Build configuration list for PBXNativeTarget "Analytics_Tests_iOS" */; - buildPhases = ( - DEDFEFE81FD1B8C100F7D466 /* Sources */, - DEDFEFE91FD1B8C100F7D466 /* Frameworks */, - DEDFEFEA1FD1B8C100F7D466 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - DEDFEFF21FD1B8C100F7D466 /* PBXTargetDependency */, - ); - name = Analytics_Tests_iOS; - productName = Analytics_Tests_iOS; - productReference = DEDFEFEC1FD1B8C100F7D466 /* Analytics_Tests_iOS.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; DEE14D401E84464D006FA992 /* Core_Example_iOS */ = { isa = PBXNativeTarget; buildConfigurationList = DEE14D641E84464D006FA992 /* Build configuration list for PBXNativeTarget "Core_Example_iOS" */; @@ -3147,10 +3097,6 @@ DEB13A0A1E73507E00AC236D = { TestTargetID = DEB139E01E73506A00AC236D; }; - DEDFEFEB1FD1B8C100F7D466 = { - DevelopmentTeam = EQHXZ8M8AV; - ProvisioningStyle = Automatic; - }; DEE14D401E84464D006FA992 = { CreatedOnToolsVersion = 8.2.1; ProvisioningStyle = Automatic; @@ -3213,7 +3159,6 @@ D0EDB2BC1EDA04F800B6C31B /* Storage_Example_macOS */, D0EDB2DE1EDA06CB00B6C31B /* Storage_Tests_macOS */, D0EDB2F81EDA06D500B6C31B /* Storage_IntegrationTests_macOS */, - DEDFEFEB1FD1B8C100F7D466 /* Analytics_Tests_iOS */, DEAAD3E01FBA46AA0053BF48 /* Storage_Example_tvOS */, DEAAD3F41FBA46AB0053BF48 /* Storage_Tests_tvOS */, DE3373891E73773400881891 /* AllUnitTests_iOS */, @@ -3525,13 +3470,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DEDFEFEA1FD1B8C100F7D466 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DEE14D3F1E84464D006FA992 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -4200,15 +4138,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DEDFEFE81FD1B8C100F7D466 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DEDFEFEF1FD1B8C100F7D466 /* Analytics_Tests_iOS.m in Sources */, - DEDFEFF71FD1B9AA00F7D466 /* DeprecatedHeaderTest.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DEE14D3D1E84464D006FA992 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4401,11 +4330,6 @@ target = DE7B8D1C1E8EF078009EB6DF /* Database_Tests_iOS */; targetProxy = DEB518591E9008CB0089C938 /* PBXContainerItemProxy */; }; - DEDFEFF21FD1B8C100F7D466 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DEE14D401E84464D006FA992 /* Core_Example_iOS */; - targetProxy = DEDFEFF11FD1B8C100F7D466 /* PBXContainerItemProxy */; - }; DEE14D5B1E84464D006FA992 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DEE14D401E84464D006FA992 /* Core_Example_iOS */; @@ -6640,69 +6564,6 @@ }; name = Release; }; - DEDFEFF31FD1B8C100F7D466 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = EQHXZ8M8AV; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Analytics_Tests_iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.google.Analytics-Tests-iOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Core_Example_iOS.app/Core_Example_iOS"; - }; - name = Debug; - }; - DEDFEFF41FD1B8C100F7D466 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = EQHXZ8M8AV; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Analytics_Tests_iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.google.Analytics-Tests-iOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Core_Example_iOS.app/Core_Example_iOS"; - }; - name = Release; - }; DEE14D601E84464D006FA992 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -7144,15 +7005,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DEDFEFF51FD1B8C100F7D466 /* Build configuration list for PBXNativeTarget "Analytics_Tests_iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DEDFEFF31FD1B8C100F7D466 /* Debug */, - DEDFEFF41FD1B8C100F7D466 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; DEE14D641E84464D006FA992 /* Build configuration list for PBXNativeTarget "Core_Example_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Example/Firebase.xcodeproj/xcshareddata/xcschemes/Analytics_Tests_iOS.xcscheme b/Example/Firebase.xcodeproj/xcshareddata/xcschemes/Analytics_Tests_iOS.xcscheme deleted file mode 100644 index e31eb3f..0000000 --- a/Example/Firebase.xcodeproj/xcshareddata/xcschemes/Analytics_Tests_iOS.xcscheme +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0910" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - </BuildAction> - <TestAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - <TestableReference - skipped = "NO"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "DEDFEFEB1FD1B8C100F7D466" - BuildableName = "Analytics_Tests_iOS.xctest" - BlueprintName = "Analytics_Tests_iOS" - ReferencedContainer = "container:Firebase.xcodeproj"> - </BuildableReference> - </TestableReference> - </Testables> - <AdditionalOptions> - </AdditionalOptions> - </TestAction> - <LaunchAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" - launchStyle = "0" - useCustomWorkingDirectory = "NO" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <AdditionalOptions> - </AdditionalOptions> - </LaunchAction> - <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/Example/Podfile b/Example/Podfile index 0d46941..61913f4 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,3 +1,7 @@ +# Uncomment the next two lines for pre-release testing +#source 'sso://cpdc-internal/spec' +#source 'https://github.com/CocoaPods/Specs.git' + use_frameworks! pod 'FirebaseCore', :path => '../' @@ -8,17 +12,12 @@ target 'Core_Example_iOS' do # The next line is the forcing function for the Firebase pod. The Firebase # version's subspecs should depend on the component versions in their # corresponding podspec's. - pod 'Firebase/Core', '4.13.0' + pod 'Firebase/Core', '5.0.0' target 'Core_Tests_iOS' do inherit! :search_paths pod 'OCMock' end - - target 'Analytics_Tests_iOS' do - inherit! :search_paths - pod 'FirebaseAnalytics' - end end target 'Auth_Example_iOS' do @@ -214,11 +213,3 @@ target 'Storage_Example_tvOS' do # pod 'OCMock' # end end - -# This post_install workaround should be removed when FirebaseAnalytics -# removes its module includes to FirebaseCore. - -post_install do | installer | - print "Fix up FirebaseAnalytics module ... \n" - system 'cp ../patch/FirebaseAnalytics.h Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/' -end diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index 7c300f1..48a9354 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuth' - s.version = '4.6.1' - s.summary = 'The official iOS client for Firebase Authentication' + s.version = '5.0.0' + s.summary = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)' s.description = <<-DESC Firebase Authentication allows you to manage your own account system without any backend code. It @@ -14,10 +14,10 @@ supports email and password accounts, as well as several 3rd party authenticatio s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => s.version.to_s + :tag => 'Auth-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '10.0' @@ -61,7 +61,6 @@ supports email and password accounts, as well as several 3rd party authenticatio } s.framework = 'SafariServices' s.framework = 'Security' - s.dependency 'FirebaseCore', '~> 4.0' - s.ios.dependency 'FirebaseAnalytics', '~> 4.0' + s.dependency 'FirebaseCore', '~> 5.0' s.dependency 'GTMSessionFetcher/Core', '~> 1.1' end diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index d25a979..5c7bd3a 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '4.0.20' - s.summary = 'Firebase Core for iOS' + s.version = '5.0.0' + s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)' s.description = <<-DESC Firebase Core includes FIRApp and FIROptions which provide central configuration for other Firebase services. @@ -13,10 +13,10 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => s.version.to_s + :tag => 'Core-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '10.0' @@ -34,6 +34,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' s.pod_target_xcconfig = { 'OTHER_CFLAGS' => '-fno-autolink ' + - '-DFIRCore_VERSION=' + s.version.to_s + ' -DFirebase_VERSION=4.13.0' + '-DFIRCore_VERSION=' + s.version.to_s + ' -DFirebase_VERSION=5.0.0' } end diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index 6138536..ae97d5a 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabase' - s.version = '4.1.5' - s.summary = 'Firebase Open Source Libraries for iOS.' + s.version = '5.0.0' + s.summary = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)' s.description = <<-DESC Simplify your iOS development, grow your user base, and monetize more effectively with Firebase. @@ -13,10 +13,10 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => s.version.to_s + :tag => 'Database-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '10.0' @@ -32,8 +32,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.libraries = ['c++', 'icucore'] s.frameworks = ['CFNetwork', 'Security', 'SystemConfiguration'] s.dependency 'leveldb-library', '~> 1.18' - s.dependency 'FirebaseCore', '~> 4.0' - s.ios.dependency 'FirebaseAnalytics', '~> 4.0' + s.dependency 'FirebaseCore', '~> 5.0' s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRDatabase_VERSION=' + s.version.to_s } diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index fb94328..2af2606 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -1,14 +1,6 @@ -# -# Be sure to run `pod lib lint FirebaseFirestore.podspec' to ensure this is a -# valid spec before submitting. -# -# Any lines starting with a # are optional, but their use is encouraged -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# - Pod::Spec.new do |s| s.name = 'FirebaseFirestore' - s.version = '0.11.0' + s.version = '0.12.0' s.summary = 'Google Cloud Firestore for iOS' s.description = <<-DESC @@ -19,10 +11,12 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.license = { :type => 'Apache', :file => 'LICENSE' } s.authors = 'Google, Inc.' - s.source = { :git => 'https://github.com/TBD/Firestore.git', :tag => s.version.to_s } - # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>' + s.source = { + :git => 'https://github.com/firebase/firebase-ios-sdk.git', + :tag => 'Firestore-' + s.version.to_s + } - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.cocoapods_version = '>= 1.4.0' s.static_framework = true @@ -53,8 +47,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, ] s.public_header_files = 'Firestore/Source/Public/*.h' - s.ios.dependency 'FirebaseAnalytics', '~> 4.0' - s.dependency 'FirebaseCore', '~> 4.0' + s.dependency 'FirebaseCore', '~> 5.0' s.dependency 'gRPC-ProtoRPC', '~> 1.0' s.dependency 'leveldb-library', '~> 1.18' s.dependency 'Protobuf', '~> 3.1' diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec index caf3023..731105c 100644 --- a/FirebaseFunctions.podspec +++ b/FirebaseFunctions.podspec @@ -1,14 +1,6 @@ -# -# Be sure to run `pod lib lint FirebaseFunctions.podspec' to ensure this is a -# valid spec before submitting. -# -# Any lines starting with a # are optional, but their use is encouraged -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# - Pod::Spec.new do |s| s.name = 'FirebaseFunctions' - s.version = '1.0.0' + s.version = '2.0.0' s.summary = 'Cloud Functions for Firebase iOS SDK.' s.description = <<-DESC @@ -16,8 +8,12 @@ iOS SDK for Cloud Functions for Firebase. DESC s.homepage = 'https://developers.google.com/' + s.license = { :type => 'Apache', :file => 'LICENSE' } s.authors = 'Google, Inc.' - s.source = { :git => 'https://github.com/TBD/FirebaseFunctions.git', :tag => s.version.to_s } + s.source = { + :git => 'https://github.com/firebase/firebase-ios-sdk.git', + :tag => 'Functions-' + s.version.to_s + } s.ios.deployment_target = '8.0' @@ -28,6 +24,6 @@ iOS SDK for Cloud Functions for Firebase. s.source_files = 'Functions/FirebaseFunctions/**/*' s.public_header_files = 'Functions/FirebaseFunctions/Public/*.h' - s.dependency 'FirebaseCore', '~> 4.0' + s.dependency 'FirebaseCore', '~> 5.0' s.dependency 'GTMSessionFetcher/Core', '~> 1.1' end diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 4d95963..8e6d7de 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseMessaging' - s.version = '2.2.0' + s.version = '3.0.0' s.summary = 'Firebase Messaging for iOS' s.description = <<-DESC @@ -16,11 +16,10 @@ device, and it is completely free. s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => s.version.to_s + :tag => 'Messaging-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '7.0' - s.osx.deployment_target = '10.10' + s.ios.deployment_target = '8.0' s.cocoapods_version = '>= 1.4.0' s.static_framework = true @@ -37,9 +36,8 @@ device, and it is completely free. 'FIRMessaging_LIB_VERSION=' + String(s.version) } s.framework = 'SystemConfiguration' - s.dependency 'FirebaseCore', '~> 4.0' - s.ios.dependency 'FirebaseAnalytics', '~> 4.0' - s.dependency 'FirebaseInstanceID', '~> 2.0' + s.dependency 'FirebaseCore', '~> 5.0' + s.dependency 'FirebaseInstanceID', '~> 3.0' s.dependency 'GoogleToolboxForMac/Logger', '~> 2.1' s.dependency 'Protobuf', '~> 3.1' end diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index f3b8f2a..d3e9339 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorage' - s.version = '2.2.0' - s.summary = 'Firebase Storage for iOS' + s.version = '3.0.0' + s.summary = 'Firebase Storage for iOS (plus community support for macOS and tvOS)' s.description = <<-DESC Firebase Storage provides robust, secure file uploads and downloads from Firebase SDKs, powered by Google Cloud Storage. @@ -13,10 +13,10 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => s.version.to_s + :tag => 'Storage-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '10.0' @@ -29,8 +29,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas s.ios.framework = 'MobileCoreServices' s.osx.framework = 'CoreServices' - s.dependency 'FirebaseCore', '~> 4.0' - s.ios.dependency 'FirebaseAnalytics', '~> 4.0' + s.dependency 'FirebaseCore', '~> 5.0' s.dependency 'GTMSessionFetcher/Core', '~> 1.1' s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index eb811e8..c1e02c8 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -1,7 +1,12 @@ +# Uncomment the next two lines for pre-release testing +#source 'sso://cpdc-internal/spec' +#source 'https://github.com/CocoaPods/Specs.git' + # The next line is the forcing function for the Firebase pod. The Firebase # version's subspecs should depend on the component versions in their # corresponding podspec's. -pod 'Firebase/Core', '4.13.0' + +pod 'Firebase/Core', '5.0.0' use_frameworks! @@ -11,20 +11,23 @@ monetize your app. More information about Firebase can be found at ## Installation See the three subsections for details about three different installation methods. -1. [Officially supported binary pods](README.md#binary-pods-ios-only) -1. [Community supported source pods](README.md#source-pods-ios-macos-tvos) +1. [Standard pod install](README.md#standard-pod-install) +1. [Installing from the GitHub repo](README.md#installing-from-github) 1. [Experimental Carthage](README.md#carthage-ios-only) -### Binary pods (iOS only) +### Standard pod install Go to [https://firebase.google.com/docs/ios/setup](https://firebase.google.com/docs/ios/setup). -### Source pods (iOS, macOS, tvOS) +### Installing from GitHub -While the official Firebase release remains a binary framework distribution, -in the future, we plan to switch to a source CocoaPod distribution for the -Firebase open source components. +For releases starting with 5.0.0, the source for each release is also deployed +to CocoaPods master and available via standard +[CocoaPods Podfile syntax](https://guides.cocoapods.org/syntax/podfile.html#pod). + +These instructions can be used to access the Firebase repo at other branches, +tags, or commits. #### Background @@ -38,22 +41,22 @@ For iOS, copy a subset of the following lines to your Podfile: ``` pod 'Firebase' # To enable Firebase module, with `@import Firebase` support -pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseAuth', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseDatabase', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseFirestore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseFunctions', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseMessaging', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseStorage', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' +pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseAuth', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseDatabase', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseFirestore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseFunctions', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseMessaging', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseStorage', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' ``` For macOS and tvOS, copy a subset of the following: ``` -pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseAuth', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseDatabase', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' -pod 'FirebaseStorage', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '4.11.0' +pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseAuth', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseDatabase', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' +pod 'FirebaseStorage', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => '5.0.0' ``` 1. Make sure you have at least CocoaPods version 1.4.0 - `pod --version`. @@ -62,17 +65,6 @@ pod 'FirebaseStorage', :git => 'https://github.com/firebase/firebase-ios-sdk.git [release notes](https://firebase.google.com/support/release-notes/ios). 1. Run `pod update`. -#### Static library usage - -If your Podfile does not include *use_frameworks!*, you need to workaround -a build issue with the FirebaseAnalytics umbrella header. Delete the first four lines -of `Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FirebaseAnalytics.h` -or copy [patch/FirebaseAnalytics.h](patch/FirebaseAnalytics.h) to -`Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FirebaseAnalytics.h`. -See the `post_install` phase of [Example/Podfile](Example/Podfile) for an example -of applying the workaround automatically - make sure you correct the path of -`patch/FirebaseAnalytics.h`. - #### Examples To access FirebaseMessaging via a checked out version of the firebase-ios-sdk repo do: diff --git a/patch/FirebaseAnalytics.h b/patch/FirebaseAnalytics.h deleted file mode 100644 index 4850741..0000000 --- a/patch/FirebaseAnalytics.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2018 Google - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// Firebase Analytics umbrella header for interoperating with open source builds -// More details at https://github.com/firebase/firebase-ios-sdk#source-pod-integration - -#import "FIRAnalytics+AppDelegate.h" -#import "FIRAnalytics.h" -#import "FIRAnalyticsSwiftNameSupport.h" -#import "FIREventNames.h" -#import "FIRParameterNames.h" -#import "FIRUserPropertyNames.h" diff --git a/scripts/push-pods.sh b/scripts/push-pods.sh new file mode 100755 index 0000000..2fb8eaa --- /dev/null +++ b/scripts/push-pods.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# Copyright 2018 Google +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Push GitHub pods to cpdc-internal-spec. + +# When bootstrapping a repo, FirebaseCore must be pushed first, then +# FirebaseInstanceID, then FirebaseAnalytics, then the rest +# Most of the warnings are tvOS specific. The Firestore one needs +# investigation. + +pod cache clean FirebaseCore --all +pod cache clean FirebaseAuth --all +pod cache clean FirebaseDatabase --all +pod cache clean FirebaseFirestore --all +pod cache clean FirebaseFunctions --all +pod cache clean FirebaseMessaging --all +pod cache clean FirebaseStorage --all + +pod repo push cpdc-internal-spec FirebaseCore.podspec +pod repo push cpdc-internal-spec FirebaseAuth.podspec +pod repo push cpdc-internal-spec FirebaseDatabase.podspec +pod repo push cpdc-internal-spec FirebaseFirestore.podspec --allow-warnings +pod repo push cpdc-internal-spec FirebaseFunctions.podspec +pod repo push cpdc-internal-spec FirebaseMessaging.podspec +pod repo push cpdc-internal-spec FirebaseStorage.podspec + +# FirebaseFirestore warning (no plan to fix) +# https://github.com/firebase/firebase-ios-sdk/issues/1143 diff --git a/scripts/update-tags.sh b/scripts/update-tags.sh new file mode 100755 index 0000000..64cf1ce --- /dev/null +++ b/scripts/update-tags.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +# Copyright 2018 Google +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Update the tags for the Firebase 5.0.0 release process + +# Before running, make sure everything is pushed. + +# This script should be a spec for a more robust Python or Swift script that +# does the following. +# 1. Verify all files are committed +# 2. Verify running on a release branch +# 3. Read the versions from the podspec (or incorporate into even more +# automated version management) + +# Delete any existing tags at origin + +git push --delete origin '5.0.0' +git push --delete origin 'Core-5.0.0' +git push --delete origin 'Auth-5.0.0' +git push --delete origin 'Database-5.0.0' +git push --delete origin 'Firestore-0.12.0' +git push --delete origin 'Functions-2.0.0' +git push --delete origin 'Messaging-3.0.0' +git push --delete origin 'Storage-3.0.0' + +# Delete local tags + +git tag --delete '5.0.0' +git tag --delete 'Core-5.0.0' +git tag --delete 'Auth-5.0.0' +git tag --delete 'Database-5.0.0' +git tag --delete 'Firestore-0.12.0' +git tag --delete 'Functions-2.0.0' +git tag --delete 'Messaging-3.0.0' +git tag --delete 'Storage-3.0.0' + +# Add and push the tags + +git tag '5.0.0' +git tag 'Core-5.0.0' +git tag 'Auth-5.0.0' +git tag 'Database-5.0.0' +git tag 'Firestore-0.12.0' +git tag 'Functions-2.0.0' +git tag 'Messaging-3.0.0' +git tag 'Storage-3.0.0' + +git push origin --tags |