Restore Firebase pod to closed source location (#4112)

firebase · Oct 17, 2019 · cc55ecc · cc55ecc
1 parent 92835a4
commit cc55ecc
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 49 deletions.
diff --git a/Firebase/Firebase/CHANGELOG.md → CoreOnly/CHANGELOG.md b/Firebase/Firebase/CHANGELOG.md → CoreOnly/CHANGELOG.md
diff --git a/Firebase/Firebase/NOTICES → CoreOnly/NOTICES b/Firebase/Firebase/NOTICES → CoreOnly/NOTICES
diff --git a/Firebase/Firebase/README.md → CoreOnly/README.md b/Firebase/Firebase/README.md → CoreOnly/README.md
diff --git a/Firebase/Firebase/Sources/Firebase.h → CoreOnly/Sources/Firebase.h b/Firebase/Firebase/Sources/Firebase.h → CoreOnly/Sources/Firebase.h
diff --git a/Firebase/Firebase/Sources/module.modulemap → CoreOnly/Sources/module.modulemap b/Firebase/Firebase/Sources/module.modulemap → CoreOnly/Sources/module.modulemap
diff --git a/...FirebasePodTest.xcodeproj/project.pbxproj → ...FirebasePodTest.xcodeproj/project.pbxproj b/...FirebasePodTest.xcodeproj/project.pbxproj → ...FirebasePodTest.xcodeproj/project.pbxproj
@@ -295,7 +295,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					../../../../Firebase/Firebase/Sources,
+					../../../CoreOnly/Sources,
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstanceID/FirebaseInstanceID.framework/Headers\"",
@@ -306,8 +306,6 @@
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/Firebase\"",
 					"\"${PODS_ROOT}/Headers/Public/FirebaseCoreDiagnosticsInterop\"",
-					"$(inherited)",
-					"${PODS_ROOT}/Firebase/Firebase/Firebase/Sources",
 				);
 				INFOPLIST_FILE = FirebasePodTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -328,7 +326,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					../../../../Firebase/Firebase/Sources,
+					../../../CoreOnly/Sources,
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstanceID/FirebaseInstanceID.framework/Headers\"",
@@ -339,8 +337,6 @@
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/Firebase\"",
 					"\"${PODS_ROOT}/Headers/Public/FirebaseCoreDiagnosticsInterop\"",
-					"$(inherited)",
-					"${PODS_ROOT}/Firebase/Firebase/Firebase/Sources",
 				);
 				INFOPLIST_FILE = FirebasePodTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

diff --git a/...PodTest/FirebasePodTest/AppDelegate.swift → ...PodTest/FirebasePodTest/AppDelegate.swift b/...PodTest/FirebasePodTest/AppDelegate.swift → ...PodTest/FirebasePodTest/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...basePodTest/Assets.xcassets/Contents.json → ...basePodTest/Assets.xcassets/Contents.json b/...basePodTest/Assets.xcassets/Contents.json → ...basePodTest/Assets.xcassets/Contents.json
diff --git a/...odTest/Base.lproj/LaunchScreen.storyboard → ...odTest/Base.lproj/LaunchScreen.storyboard b/...odTest/Base.lproj/LaunchScreen.storyboard → ...odTest/Base.lproj/LaunchScreen.storyboard
diff --git a/...irebasePodTest/Base.lproj/Main.storyboard → ...irebasePodTest/Base.lproj/Main.storyboard b/...irebasePodTest/Base.lproj/Main.storyboard → ...irebasePodTest/Base.lproj/Main.storyboard
diff --git a/...irebasePodTest/FirebasePodTest/Info.plist → ...irebasePodTest/FirebasePodTest/Info.plist b/...irebasePodTest/FirebasePodTest/Info.plist → ...irebasePodTest/FirebasePodTest/Info.plist
diff --git a/...dTest/FirebasePodTest/SceneDelegate.swift → ...dTest/FirebasePodTest/SceneDelegate.swift b/...dTest/FirebasePodTest/SceneDelegate.swift → ...dTest/FirebasePodTest/SceneDelegate.swift
diff --git a/...Test/FirebasePodTest/ViewController.swift → ...Test/FirebasePodTest/ViewController.swift b/...Test/FirebasePodTest/ViewController.swift → ...Test/FirebasePodTest/ViewController.swift
diff --git a/CoreOnly/Tests/FirebasePodTest/Podfile b/CoreOnly/Tests/FirebasePodTest/Podfile
@@ -0,0 +1,29 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+target 'FirebasePodTest' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  pod 'Firebase', :path => '../../../'
+  pod 'FirebaseABTesting', :path => '../../../'
+  pod 'FirebaseAnalyticsInterop', :path => '../../../'
+  pod 'FirebaseAuth', :path => '../../../'
+  pod 'FirebaseAuthInterop', :path => '../../../'
+  pod 'FirebaseCoreDiagnostics', :path => '../../../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../../'
+  pod 'FirebaseDatabase', :path => '../../../'
+  pod 'FirebaseDynamicLinks', :path => '../../../'
+  pod 'FirebaseFirestore', :path => '../../../'
+  pod 'FirebaseFunctions', :path => '../../../'
+  pod 'FirebaseInAppMessaging', :path => '../../../'
+  pod 'FirebaseInAppMessagingDisplay', :path => '../../../'
+  pod 'FirebaseInstallations', :path => '../../../'
+  pod 'FirebaseInstanceID', :path => '../../../'
+  pod 'FirebaseMessaging', :path => '../../../'
+  pod 'FirebaseRemoteConfig', :path => '../../../'
+  pod 'FirebaseStorage', :path => '../../../'
+
+  pod 'FirebaseAnalytics' # Analytics is not open source
+  pod 'FirebasePerformance' # Performance is not open source
+end
diff --git a/Firebase.podspec b/Firebase.podspec
@@ -17,10 +17,9 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   }
 
   s.preserve_paths = [
-    "Firebase/Firebase/.cocoapods.yml",
-    "Firebase/Firebase/CHANGELOG.md",
-    "Firebase/Firebase/NOTICES",
-    "Firebase/Firebase/README.md"
+    "CoreOnly/CHANGELOG.md",
+    "CoreOnly/NOTICES",
+    "CoreOnly/README.md"
   ]
   s.social_media_url = 'https://twitter.com/Firebase'
   s.ios.deployment_target = '8.0'
@@ -38,10 +37,10 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'CoreOnly' do |ss|
     ss.dependency 'FirebaseCore', '6.3.2'
-    ss.source_files = 'Firebase/Firebase/Sources/Firebase.h'
-    ss.preserve_paths = 'Firebase/Firebase/Sources/module.modulemap'
+    ss.source_files = 'CoreOnly/Sources/Firebase.h'
+    ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
     ss.user_target_xcconfig = {
-      'HEADER_SEARCH_PATHS' => "$(inherited) ${PODS_ROOT}/Firebase/Firebase/Firebase/Sources"
+      'HEADER_SEARCH_PATHS' => "$(inherited) ${PODS_ROOT}/Firebase/CoreOnly/Sources"
   }
   end
 

diff --git a/Firebase/Firebase/Tests/FirebasePodTest/Podfile b/Firebase/Firebase/Tests/FirebasePodTest/Podfile
diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj
@@ -5001,7 +5001,6 @@
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"${PODS_ROOT}/Firebase/Firebase/Firebase\"",
 					"\"${PODS_ROOT}/leveldb-library/include\"",
 				);
 				INFOPLIST_FILE = "App/iOS/Firestore-Info.plist";
@@ -5024,7 +5023,6 @@
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"${PODS_ROOT}/Firebase/Firebase/Firebase\"",
 					"\"${PODS_ROOT}/leveldb-library/include\"",
 				);
 				INFOPLIST_FILE = "App/iOS/Firestore-Info.plist";

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -224,7 +224,7 @@ case "$product-$method-$platform" in
 
   FirebasePod-xcodebuild-*)
     RunXcodebuild \
-        -workspace 'Firebase/Firebase/Tests/FirebasePodTest/FirebasePodTest.xcworkspace' \
+        -workspace 'CoreOnly/Tests/FirebasePodTest/FirebasePodTest.xcworkspace' \
         -scheme "FirebasePodTest" \
         "${xcb_flags[@]}" \
         build

diff --git a/scripts/check_whitespace.sh b/scripts/check_whitespace.sh
@@ -28,7 +28,7 @@ options=(
 git grep "${options[@]}" -- \
     ':(exclude)Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb' \
     ':(exclude)Firebase/CoreDiagnostics/ProtoSupport' \
-    ':(exclude)Firebase/Firebase/NOTICES' \
+    ':(exclude)CoreOnly/NOTICES' \
     ':(exclude)Firebase/InAppMessaging/ProtoSupport' \
     ':(exclude)Firebase/InAppMessaging/Analytics/Protogen/nanopb' \
     ':(exclude)Firestore/Protos/nanopb' \

diff --git a/scripts/if_changed.sh b/scripts/if_changed.sh
@@ -67,7 +67,7 @@ else
       ;;
 
     FirebasePod-*)
-      check_changes '^(Firebase/Firebase|Firebase.podspec)'
+      check_changes '^(CoreOnly|Firebase.podspec)'
       ;;
 
     Core-*)

diff --git a/scripts/install_prereqs.sh b/scripts/install_prereqs.sh
@@ -60,7 +60,7 @@ case "$PROJECT-$PLATFORM-$METHOD" in
 
   FirebasePod-iOS-xcodebuild)
     gem install xcpretty
-    bundle exec pod install --project-directory=Firebase/Firebase/Tests/FirebasePodTest --repo-update
+    bundle exec pod install --project-directory=CoreOnly/Tests/FirebasePodTest --repo-update
     ;;
 
   Auth-*)

diff --git a/scripts/style.sh b/scripts/style.sh
@@ -157,7 +157,7 @@ s%^./%%
 \%^(Example|Firebase)/(Auth|AuthSamples|Messaging)/% d
 
 # Keep Firebase.h indenting
-\%^Firebase/Firebase/Sources/Firebase.h% d
+\%^CoreOnly/Sources/Firebase.h% d
 
 # Checked-in generated code
 \%\.pb(objc|rpc)\.% d
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ else @@
           ;;
         FirebasePod-*)
-          check_changes '^(Firebase/Firebase|Firebase.podspec)'
+          check_changes '^(CoreOnly|Firebase.podspec)'
           ;;
         Core-*)
@@ Expand Down @@