aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firebase
diff options
context:
space:
mode:
authorGravatar Paul Beusterien <paulbeusterien@google.com>2017-11-21 17:02:22 -0800
committerGravatar GitHub <noreply@github.com>2017-11-21 17:02:22 -0800
commit3e592526ec889887874efd0e46ba3cf72f2f6f98 (patch)
treede8cc73df387cd982ca9bbf517f8ff1a9c41cce3 /Firebase
parent32d6d6170fdca6f12a3fa51619081ad855815803 (diff)
Buildable and interoperable source pods (#444)
Diffstat (limited to 'Firebase')
-rw-r--r--Firebase/Auth/Source/FirebaseAuthVersion.m4
-rw-r--r--Firebase/Auth/Source/Public/FirebaseAuthVersion.h4
-rw-r--r--Firebase/Auth/Source/RPCs/FIRAuthBackend.m4
-rw-r--r--Firebase/Core/FirebaseCore.podspec29
-rw-r--r--Firebase/Firebase/FirebaseCommunity.h77
-rw-r--r--Firebase/Firebase/module.modulemap6
6 files changed, 6 insertions, 118 deletions
diff --git a/Firebase/Auth/Source/FirebaseAuthVersion.m b/Firebase/Auth/Source/FirebaseAuthVersion.m
index fe4055b..c79d984 100644
--- a/Firebase/Auth/Source/FirebaseAuthVersion.m
+++ b/Firebase/Auth/Source/FirebaseAuthVersion.m
@@ -20,7 +20,7 @@
#define STR(x) STR_EXPAND(x)
#define STR_EXPAND(x) #x
-const double FirebaseAuthVersionNumber = FIRAuth_MINOR_VERSION;
+const double FirebaseAuthVersionNum = FIRAuth_MINOR_VERSION;
-const unsigned char *const FirebaseAuthVersionString =
+const unsigned char *const FirebaseAuthVersionStr =
(const unsigned char *const)STR(FIRAuth_VERSION);
diff --git a/Firebase/Auth/Source/Public/FirebaseAuthVersion.h b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h
index 1b2d06a..2999384 100644
--- a/Firebase/Auth/Source/Public/FirebaseAuthVersion.h
+++ b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h
@@ -19,9 +19,9 @@
/**
Version number for FirebaseAuth.
*/
-extern const double FirebaseAuthVersionNumber;
+extern const double FirebaseAuthVersionNum;
/**
Version string for FirebaseAuth.
*/
-extern const unsigned char *const FirebaseAuthVersionString;
+extern const unsigned char *const FirebaseAuthVersionStr;
diff --git a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
index 2442882..6b5232b 100644
--- a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
+++ b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
@@ -472,7 +472,7 @@ static id<FIRAuthBackendImplementation> gBackendImplementation;
+ (NSString *)authUserAgent {
return [NSString stringWithFormat:@"FirebaseAuth.iOS/%s %@",
- FirebaseAuthVersionString, GTMFetcherStandardUserAgentString(nil)];
+ FirebaseAuthVersionStr, GTMFetcherStandardUserAgentString(nil)];
}
@end
@@ -507,7 +507,7 @@ static id<FIRAuthBackendImplementation> gBackendImplementation;
NSString *additionalFrameworkMarker = requestConfiguration.additionalFrameworkMarker ?:
kFirebaseAuthCoreFrameworkMarker;
NSString *clientVersion = [NSString stringWithFormat:@"iOS/FirebaseSDK/%s/%@",
- FirebaseAuthVersionString,
+ FirebaseAuthVersionStr,
additionalFrameworkMarker];
[request setValue:clientVersion forHTTPHeaderField:kClientVersionHeader];
NSString *bundleID = [[NSBundle mainBundle] bundleIdentifier];
diff --git a/Firebase/Core/FirebaseCore.podspec b/Firebase/Core/FirebaseCore.podspec
deleted file mode 100644
index f78fe44..0000000
--- a/Firebase/Core/FirebaseCore.podspec
+++ /dev/null
@@ -1,29 +0,0 @@
-# This podspec is not intended to be deployed. It is solely for the static
-# library framework build process at
-# https://github.com/firebase/firebase-ios-sdk/tree/master/BuildFrameworks
-
-Pod::Spec.new do |s|
- s.name = 'FirebaseCore'
- s.version = '4.0.3'
- s.summary = 'Firebase Open Source Libraries for iOS.'
-
- s.description = <<-DESC
-Simplify your iOS development, grow your user base, and monetize more effectively with Firebase.
- DESC
-
- s.homepage = 'https://firebase.google.com'
- s.license = { :type => 'Apache', :file => '../../LICENSE' }
- s.authors = 'Google, Inc.'
-
- # NOTE that the FirebaseCommunity pod is neither publicly deployed nor yet interchangeable with the
- # Firebase pod
- s.source = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => 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.source_files = '**/*.[mh]'
- s.public_header_files = 'Firebase/Core/Public/*.h','Firebase/Core/Private/*.h'
- s.private_header_files = 'Firebase/Core/Private/*.h'
- s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1'
-end
diff --git a/Firebase/Firebase/FirebaseCommunity.h b/Firebase/Firebase/FirebaseCommunity.h
deleted file mode 100644
index 83e37cf..0000000
--- a/Firebase/Firebase/FirebaseCommunity.h
+++ /dev/null
@@ -1,77 +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.
- */
-
-#if !defined(__has_include)
- #error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
- import the headers individually."
-#else
- #if __has_include(<FirebaseCommunity/FirebaseCore.h>)
- #import <FirebaseCommunity/FirebaseCore.h>
- #endif
-
- #if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
- #import <FirebaseAnalytics/FirebaseAnalytics.h>
- #endif
-
- #if __has_include(<FirebaseCommunity/FirebaseAuth.h>)
- #import <FirebaseCommunity/FirebaseAuth.h>
- #endif
-
- #if __has_include(<FirebaseCrash/FirebaseCrash.h>)
- #import <FirebaseCrash/FirebaseCrash.h>
- #endif
-
- #if __has_include(<FirebaseCommunity/FirebaseDatabase.h>)
- #import <FirebaseCommunity/FirebaseDatabase.h>
- #endif
-
- #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
- #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
- #endif
-
- #if __has_include(<Firebase/FirebaseInstanceID.h>)
- #import <Firebase/FirebaseInstanceID.h>
- #endif
-
- #if __has_include(<FirebaseInvites/FirebaseInvites.h>)
- #import <FirebaseInvites/FirebaseInvites.h>
- #endif
-
- #if __has_include(<FirebaseCommunity/FirebaseMessaging.h>)
- #import <FirebaseCommunity/FirebaseMessaging.h>
- #endif
-
- #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
- #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
- #endif
-
- #if __has_include(<FirebaseCommunity/FirebaseStorage.h>)
- #import <FirebaseCommunity/FirebaseStorage.h>
- #endif
-
- #if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)
- #import <GoogleMobileAds/GoogleMobileAds.h>
- #endif
-
- #if __has_include(<Fabric/Fabric.h>)
- #import <Fabric/Fabric.h>
- #endif
-
- #if __has_include(<Crashlytics/Crashlytics.h>)
- #import <Crashlytics/Crashlytics.h>
- #endif
-
-#endif // defined(__has_include)
diff --git a/Firebase/Firebase/module.modulemap b/Firebase/Firebase/module.modulemap
deleted file mode 100644
index 8e6c477..0000000
--- a/Firebase/Firebase/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module FirebaseCommunity {
- umbrella header "FirebaseCommunity.h"
-
- export *
- module * { export * }
-}