Incorporate SpecsDev (#7561)

paulb777 · web-flow · commit cf49cbaa54ff · 2021-02-19T07:18:59.000-08:00
diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml
@@ -23,5 +23,5 @@ jobs:
     - name: GoogleAppMeasurement
       run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec.json
 
-# TODO: Consider pushing GoogleAppMeasurement.podspec.json to SpecsStaging to enable similar test
+# TODO: Consider pushing GoogleAppMeasurement.podspec.json to SpecsDev to enable similar test
 # for FirebaseAnalytics.podspec.json
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -37,7 +37,7 @@ jobs:
         cd scripts/create_spec_repo/
         swift build
         pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/FirebasePrivate/SpecsReleasing.git
-        BOT_TOKEN="${botaccess}"  .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsReleasing --pod-sources 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsReleasing' --pod-sources "https://github.com/firebase/SpecsStaging.git" --pod-sources "https://cdn.cocoapods.org/"
+        BOT_TOKEN="${botaccess}"  .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsReleasing --pod-sources 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsReleasing' --pod-sources "https://github.com/firebase/SpecsDev.git" --pod-sources "https://github.com/firebase/SpecsStaging.git" --pod-sources "https://cdn.cocoapods.org/"
     - name: Clean Artifacts
       if: ${{ always() }}
       run: |
diff --git a/CoreOnly/Tests/FirebasePodTest/Podfile b/CoreOnly/Tests/FirebasePodTest/Podfile
@@ -1,6 +1,7 @@
 # Uncomment the next line to define a global platform for your project
 platform :ios, '10.0'
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/Example/watchOSSample/Podfile b/Example/watchOSSample/Podfile
@@ -1,3 +1,4 @@
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile
@@ -2,6 +2,7 @@
 #source 'sso://cpdc-internal/firebase'
 #source 'https://cdn.cocoapods.org/'
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseDynamicLinks/Tests/Sample/Podfile b/FirebaseDynamicLinks/Tests/Sample/Podfile
@@ -1,3 +1,4 @@
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile
@@ -1,3 +1,4 @@
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/Podfile b/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/Podfile
@@ -1,5 +1,6 @@
 use_frameworks!
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseMessaging/Apps/AdvancedSample/Podfile b/FirebaseMessaging/Apps/AdvancedSample/Podfile
@@ -1,5 +1,6 @@
 use_frameworks! :linkage => :static
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseMessaging/Apps/Sample/Podfile b/FirebaseMessaging/Apps/Sample/Podfile
@@ -1,5 +1,6 @@
 use_frameworks!
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebasePerformance/Tests/FIRPerfE2E/Podfile b/FirebasePerformance/Tests/FIRPerfE2E/Podfile
@@ -1,3 +1,4 @@
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/FirebaseRemoteConfig/Tests/Sample/Podfile b/FirebaseRemoteConfig/Tests/Sample/Podfile
@@ -1,6 +1,7 @@
 # Uncomment the next line to define a global platform for your project
 # platform :ios, '9.0'
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
@@ -6,6 +6,7 @@ require 'pathname'
 #source 'sso://cpdc-internal/firebase'
 #source 'https://cdn.cocoapods.org/'
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile
@@ -1,5 +1,6 @@
 platform :ios, '10.0'
 
+source 'https://github.com/firebase/SpecsDev.git'
 source 'https://github.com/firebase/SpecsStaging.git'
 source 'https://cdn.cocoapods.org/'
 
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -20,7 +20,7 @@
 
 function pod_gen() {
   # Call pod gen with a podspec and additional optional arguments.
-  bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ "$@"
+  bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ "$@"
 }
 
 set -euo pipefail
diff --git a/scripts/create_spec_repo/Sources/SpecRepoBuilder/main.swift b/scripts/create_spec_repo/Sources/SpecRepoBuilder/main.swift
@@ -24,6 +24,7 @@ extension Constants {
   static let dependencyLineSeparators = CharacterSet(charactersIn: " ,/")
   static let podSources = [
     "https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting",
+    "https://github.com/firebase/SpecsDev.git",
     "https://github.com/firebase/SpecsStaging.git",
     "https://cdn.cocoapods.org/",
   ]
diff --git a/scripts/localize_podfile.swift b/scripts/localize_podfile.swift
@@ -55,8 +55,9 @@ while url.path != "/", url.lastPathComponent != "firebase-ios-sdk" {
 let repo = url
 let lines = fileContents.components(separatedBy: .newlines)
 var outBuffer =
-  "source 'https://github.com/firebase/SpecsStaging.git'\n"
-    + "source 'https://cdn.cocoapods.org/'\n"
+  "source 'https://github.com/firebase/SpecsDev.git'\n" +
+  "source 'https://github.com/firebase/SpecsStaging.git'\n" +
+  "source 'https://cdn.cocoapods.org/'\n"
 for line in lines {
   var newLine = line.trimmingCharacters(in: .whitespacesAndNewlines)
   let tokens = newLine.components(separatedBy: [" ", ","] as CharacterSet)
diff --git a/scripts/pod_lib_lint.rb b/scripts/pod_lib_lint.rb
@@ -47,7 +47,7 @@ def main(args)
 
   STDOUT.sync = true
 
-  command = %w(bundle exec pod lib lint --sources=https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/)
+  command = %w(bundle exec pod lib lint --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/)
 
   # Split arguments that need to be processed by the script itself and passed
   # to the pod command.
diff --git a/scripts/test_archiving.sh b/scripts/test_archiving.sh
@@ -46,7 +46,7 @@ case "$platform" in
   ;;
 esac
 
-bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ \
+bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ \
   "$pod".podspec --platforms="$platform"
 
 args=(
diff --git a/scripts/test_catalyst.sh b/scripts/test_catalyst.sh
@@ -37,7 +37,7 @@ else
   scheme="$pod"
 fi
 
-bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ \
+bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ \
   "$pod".podspec --platforms=ios
 
 args=(

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+source 'https://github.com/firebase/SpecsDev.git'`
`1`	`2`	`source 'https://github.com/firebase/SpecsStaging.git'`
`2`	`3`	`source 'https://cdn.cocoapods.org/'`
`3`	`4`