[Infra] Rename references from master to main (#12203)

firebase · Dec 15, 2023 · ca522d2 · ca522d2
1 parent a8264f0
commit ca522d2
Show file tree

Hide file tree

Showing 42 changed files with 179 additions and 179 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -5,7 +5,7 @@ on:
     paths-ignore:
     - 'Firestore/**'
   push:
-    branches: master
+    branches: main
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

diff --git a/.github/workflows/health-metrics-presubmit.yml b/.github/workflows/health-metrics-presubmit.yml
@@ -58,7 +58,7 @@ jobs:
     needs: check
     # Prevent the job from being triggered in fork.
     # always() will trigger this job when `needs` are skipped in a `merge` pull_request event.
-    if: always() && github.event.pull_request.head.repo.full_name == github.repository && ((github.event.action != 'closed' &&  github.event.pull_request.base.ref == 'master') || github.event.pull_request.merged)
+    if: always() && github.event.pull_request.head.repo.full_name == github.repository && ((github.event.action != 'closed' &&  github.event.pull_request.base.ref == 'main') || github.event.pull_request.merged)
     runs-on: macos-12
     strategy:
       matrix:
@@ -384,7 +384,7 @@ jobs:
         with:
           path: /Users/runner/test
       - name: Compare Diff and Post a Report
-        if: github.event.pull_request.merged != true && github.event.action != 'closed' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.base.ref == 'master'
+        if: github.event.pull_request.merged != true && github.event.action != 'closed' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.base.ref == 'main'
         env:
           base_commit: ${{ needs.check.outputs.target_branch_head }}
         run: |

diff --git a/.github/workflows/performance-integration-tests.yml b/.github/workflows/performance-integration-tests.yml
@@ -1,4 +1,4 @@
-# Merge the yml file to master branch for the cron job schedule to be effective.
+# Merge the yml file to main branch for the cron job schedule to be effective.
 # Reference: https://github.community/t/on-schedule-per-branch/17525
 name: performance-integration-tests
 

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -1,4 +1,4 @@
-# Merge the yml file to master branch for the cron job schedule to be effective.
+# Merge the yml file to main branch for the cron job schedule to be effective.
 # Reference: https://github.community/t/on-schedule-per-branch/17525
 name: performance
 

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -25,7 +25,7 @@ jobs:
       # testing repo.
       local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
       local_repo: specstesting
-      podspec_repo_branch: master
+      podspec_repo_branch: main
     outputs:
       matrix: ${{ steps.generate_matrix.outputs.matrix }}
     steps:
@@ -161,7 +161,7 @@ jobs:
       bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       local_repo: specstesting
       local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
-      podspec_repo_branch: master
+      podspec_repo_branch: main
     steps:
     - uses: actions/checkout@v4
     - name: Get token
@@ -173,14 +173,14 @@ jobs:
     - name: Update SpecsTesting repo setup
       run: |
          ossbotaccess=`cat oss-bot-access.txt`
-         # Update/create a nightly tag to the head of the master branch.
+         # Update/create a nightly tag to the head of the main branch.
          BOT_TOKEN="${ossbotaccess}" test_version="${nightly_version}" sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" local_sdk_repo_dir="${local_sdk_repo_dir}" podspec_repo_branch="${podspec_repo_branch}" scripts/release_testing_setup.sh prerelease_testing
     - name: Push updated podspecs
       run: |
         botaccess=`cat bot-access.txt`
         cd "${local_sdk_repo_dir}"
         # Changes in post submit tests will be fetched by getting diff between
-        # the HEAD and HEAD^ of the master branch.
+        # the HEAD and HEAD^ of the main branch.
         common_commit=$(git rev-parse HEAD^)
         git diff --name-only $common_commit remotes/origin/${podspec_repo_branch} > updated_files.txt
         updated_podspecs=()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       # testing repo.
       local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
       local_repo: specstesting
-      podspec_repo_branch: master
+      podspec_repo_branch: main
     outputs:
       matrix: ${{ steps.generate_matrix.outputs.matrix }}
     steps:

diff --git a/.github/workflows/sessions-integration-tests.yml b/.github/workflows/sessions-integration-tests.yml
@@ -1,4 +1,4 @@
-# Merge the yml file to master branch for the cron job schedule to be effective.
+# Merge the yml file to main branch for the cron job schedule to be effective.
 # Reference: https://github.community/t/on-schedule-per-branch/17525
 name: sessions-integration-tests
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -326,8 +326,8 @@ For developers without write access, you'll need to create a fork of Firebase
 instead of a branch. Learn more about forking a repo [here][github-forks].
 
 ```console
-# Update your local master
-git checkout master
+# Update your local main
+git checkout main
 git pull
 
 # Create a development branch

diff --git a/Carthage.md b/Carthage.md
@@ -77,8 +77,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
 
 - For Crashlytics, do the following steps to automatically upload your app's symbols so your app's crashes are symbolicated:
     - Download
-     [upload-symbols](https://github.com/firebase/firebase-ios-sdk/raw/master/Crashlytics/upload-symbols)
-     and [run](https://github.com/firebase/firebase-ios-sdk/raw/master/Crashlytics/run).
+     [upload-symbols](https://github.com/firebase/firebase-ios-sdk/raw/main/Crashlytics/upload-symbols)
+     and [run](https://github.com/firebase/firebase-ios-sdk/raw/main/Crashlytics/run).
      Note: please see the [discussion](https://github.com/firebase/firebase-ios-sdk/issues/4720#issuecomment-577213858)
      for details why it has to be done manually.
     - Put these in the directory where your `.xcodeproj` file lives, eg. `scripts/run` and `scripts/upload-symbols`

diff --git a/Crashlytics/CHANGELOG.md b/Crashlytics/CHANGELOG.md
@@ -164,7 +164,7 @@
 
 This Firebase Crashlytics version includes the initial beta release of the Firebase Crashlytics SDK:
 
- - [feature] The SDK is now open-sourced. Take a look in our [GitHub repository](https://github.com/firebase/firebase-ios-sdk/tree/master/Crashlytics).
+ - [feature] The SDK is now open-sourced. Take a look in our [GitHub repository](https://github.com/firebase/firebase-ios-sdk/tree/main/Crashlytics).
  - [feature] Added support for Catalyst (note that Crashlytics still supports tvOS and macOS).
  - [feature] Added new APIs that are more consistent with other Firebase SDKs and more intuitive to use. The new APIs also give your users more control over how you collect their data.
  - [removed] Removed the Fabric API Key. Now, Crashlytics uses the GoogleService-Info.plist file to associate your app with your project. If you linked your app from Fabric and want to upgrade to the new SDK, remove the Fabric API key from your `run` and `upload-symbols` scripts. We also recommend removing the Fabric section from your app's Info.plist (when you upgrade, Crashlytics uses the new configuration you set up in Firebase).
diff --git a/FirebaseAppDistributionInternal/README.md b/FirebaseAppDistributionInternal/README.md
@@ -1,12 +1,12 @@
 This library currently contains upcoming changes, and isn't meant to be used in production.
 
-It exists in `master` for CI purposes.
+It exists in `main` for CI purposes.
 
-## Steps to copy over changes in FirebaseAppDistributionInternal to master
+## Steps to copy over changes in FirebaseAppDistributionInternal to main
 
-For CI builds, this pod needs to be in master. To copy over changes, do the following:
+For CI builds, this pod needs to be in main. To copy over changes, do the following:
 
 1. `git checkout -b fad/appdistributioninternal`
 1. `git checkout fad/in-app-feedback FirebaseAppDistributionInternal/`
 
-Then open a PR to merge these changes to master. This won't affect the public version of `FirebaseAppDistribution`.
+Then open a PR to merge these changes to main. This won't affect the public version of `FirebaseAppDistribution`.
diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.h b/FirebaseAuth/Sources/Backend/FIRAuthBackend.h
@@ -256,7 +256,7 @@ typedef void (^FIRGetRecaptchaConfigResponseCallback)(
     @brief Simple static class with methods representing the backend RPCs.
     @remarks All callback blocks passed as method parameters are invoked asynchronously on the
         global work queue in the future. See
-        https://github.com/firebase/firebase-ios-sdk/tree/master/FirebaseAuth/Docs/threading.md
+        https://github.com/firebase/firebase-ios-sdk/tree/main/FirebaseAuth/Docs/threading.md
  */
 @interface FIRAuthBackend : NSObject
 

diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md
@@ -139,7 +139,7 @@
 - [fixed] Fixed platform availability checks in Swift Package Manager that may prevent code
   completion for Analytics APIs on macOS and tvOS. (#9032)
 - [added] Firebase now includes community supported Combine publishers. More details can be found
-  [here](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseCombineSwift/README.md). (#7295)
+  [here](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseCombineSwift/README.md). (#7295)
 
 # Firebase 8.9.0
 - [added] Firebase introduces beta support for tvOS, macOS, and Catalyst.
@@ -266,7 +266,7 @@
 
 # Firebase 6.31.0 FirebaseCore 6.10.1 -- M78
 - [added] Beta release of Swift Package Manager. Details
-  [here](https://github.com/firebase/firebase-ios-sdk/blob/master/SwiftPackageManager.md). (#3136)
+  [here](https://github.com/firebase/firebase-ios-sdk/blob/main/SwiftPackageManager.md). (#3136)
 - [changed] Firebase's dependencies on nanopb are updated from version 0.3.9.5 to
   version 0.3.9.6 (1.30906.0 in CocoaPods).
 
@@ -300,7 +300,7 @@
 - [fixed] Fixed Carthage installation failures involving `Protobuf.framework`.
   `Protobuf.framework` is now separately installable via adding
   `FirebaseProtobufBinary.json` to the Cartfile. Full details in the [Carthage usage
-  instructions](https://github.com/firebase/firebase-ios-sdk/blob/master/Carthage.md#carthage-usage).
+  instructions](https://github.com/firebase/firebase-ios-sdk/blob/main/Carthage.md#carthage-usage).
   (#5276)
 
 # v6.6.6 -- M68

diff --git a/FirebaseDynamicLinks/CHANGELOG.md b/FirebaseDynamicLinks/CHANGELOG.md
@@ -69,7 +69,7 @@
 - [fixed] Reduce frequency of iOS14 pasteboard notifications by only reading from it when it contains URL(s). (#5905)
 - [changed] Functionally neutral updated import references for dependencies. (#5824)
 
-Refer to the [README.md](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseDynamicLinks/README.md) for more details about this release.
+Refer to the [README.md](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseDynamicLinks/README.md) for more details about this release.
 
 # 4.1.0
 - [fixed] Fixing unwanted pending dynamic links checks on subsequent app restarts. (#5665)

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h
@@ -17,7 +17,7 @@
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
 // This file contains declarations that should go into FirebaseCore when
-// Firebase InAppMessagingDisplay is merged into master. Keep them separate now to help
+// Firebase InAppMessagingDisplay is merged into main. Keep them separate now to help
 // with build from development folder and avoid merge conflicts.
 
 extern FIRLoggerService kFIRLoggerInAppMessagingDisplay;

diff --git a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h
@@ -17,7 +17,7 @@
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
 // This file contains declarations that should go into FirebaseCore when
-// Firebase InAppMessaging is merged into master. Keep them separate now to help
+// Firebase InAppMessaging is merged into main. Keep them separate now to help
 // with build from development folder and avoid merge conflicts.
 
 // this should eventually be in FIRLogger.h

diff --git a/FirebasePerformance/ProtoSupport/README.md b/FirebasePerformance/ProtoSupport/README.md
@@ -3,4 +3,4 @@ To build the protos:
 - Verify version in generate_protos.sh
 - `./generate_protos.sh`
 
-Make sure to [re-generate the project](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebasePerformance#to-develop-on-firebase-performance) after protos are built.
+Make sure to [re-generate the project](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebasePerformance#to-develop-on-firebase-performance) after protos are built.
diff --git a/FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m b/FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m
@@ -39,11 +39,11 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
 - (instancetype)initAndSetup {
   self = [super initWithNibName:nil bundle:nil];
   if (self) {
-    ScreenTracesTestScreensListViewController *masterView =
+    ScreenTracesTestScreensListViewController *mainView =
         [[ScreenTracesTestScreensListViewController alloc] initWithNibName:nil bundle:nil];
-    UINavigationController *masterNav =
-        [[UINavigationController alloc] initWithRootViewController:masterView];
-    self.viewControllers = @[ masterNav ];
+    UINavigationController *mainNav =
+        [[UINavigationController alloc] initWithRootViewController:mainView];
+    self.viewControllers = @[ mainNav ];
     self.delegate = self;
   }
   return self;

diff --git a/FirebaseRemoteConfigSwift/CHANGELOG.md b/FirebaseRemoteConfigSwift/CHANGELOG.md
@@ -20,6 +20,6 @@
 
 # 8.12.0-beta
 - Initial public beta release with Codable support. See example usage in
-  https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseRemoteConfigSwift/Tests/Codable.swift
+  https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseRemoteConfigSwift/Tests/Codable.swift
   and
-  https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseRemoteConfigSwift/Tests/Value.swift. (#6883)
+  https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseRemoteConfigSwift/Tests/Value.swift. (#6883)
diff --git a/FirebaseRemoteConfigSwift/Tests/README.md b/FirebaseRemoteConfigSwift/Tests/README.md
@@ -6,7 +6,7 @@ Currently the Remote Config tests run in two configurations:
 
 ## Remote Config Console API
 
-[`RemoteConfigConsole.swift`](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseRemoteConfigSwift/Tests/SwiftAPI/RemoteConfigConsole.swift)
+[`RemoteConfigConsole.swift`](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseRemoteConfigSwift/Tests/SwiftAPI/RemoteConfigConsole.swift)
 provides a simple API for interacting with an app's Remote Config on the
 Firebase console.
 
@@ -51,10 +51,10 @@ example.
 
 For the access token to be generated, the `GOOGLE_APPLICATION_CREDENTIALS` env var should be set to point to where the
 Firebase project's service account key is stored. This is set in the
-[`generate_access_token.sh`](https://github.com/firebase/firebase-ios-sdk/blob/master/scripts/generate_access_token.sh)
+[`generate_access_token.sh`](https://github.com/firebase/firebase-ios-sdk/blob/main/scripts/generate_access_token.sh)
 script.
 
 #### Remote Config API Tests
-There is a [section](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseRemoteConfigSwift/Tests/SwiftAPI/APITests.swift#L210)
-of tests in [`APITests.swift`](https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseRemoteConfigSwift/Tests/SwiftAPI/APITests.swift)
+There is a [section](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseRemoteConfigSwift/Tests/SwiftAPI/APITests.swift#L210)
+of tests in [`APITests.swift`](https://github.com/firebase/firebase-ios-sdk/blob/main/FirebaseRemoteConfigSwift/Tests/SwiftAPI/APITests.swift)
 showcasing the  `RemoteConfigConsole` in action.
diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md
@@ -465,7 +465,7 @@
 - [changed] Firestore no longer bundles a copy of the gRPC certificates, now
   that the gRPC-C++ CocoaPod includes them. CocoaPods users should be updated
   automatically. Carthage users should follow the [updated
-  instructions](https://github.com/firebase/firebase-ios-sdk/blob/master/Carthage.md)
+  instructions](https://github.com/firebase/firebase-ios-sdk/blob/main/Carthage.md)
   to get `gRPCCertificates.bundle` from the correct location.
 
 # 0.16.1

diff --git a/Firestore/core/test/unit/FSTGoogleTestTests.mm b/Firestore/core/test/unit/FSTGoogleTestTests.mm
@@ -333,11 +333,11 @@ Class CreateXCTestCaseClass(const testing::TestCase* testCase,
   [allTestsSuite
       addTest:[XCTestSuite testSuiteForTestCaseClass:[GoogleTests class]]];
 
-  const testing::UnitTest* master = testing::UnitTest::GetInstance();
+  const testing::UnitTest* main = testing::UnitTest::GetInstance();
 
-  int testCases = master->total_test_case_count();
+  int testCases = main->total_test_case_count();
   for (int i = 0; i < testCases; i++) {
-    const testing::TestCase* testCase = master->GetTestCase(i);
+    const testing::TestCase* testCase = main->GetTestCase(i);
     NSString* testCaseName = ClassNameForTestCase(testCase);
     Class testClass = objc_getClass([testCaseName UTF8String]);
     [allTestsSuite addTest:[XCTestSuite testSuiteForTestCaseClass:testClass]];
@@ -351,19 +351,19 @@ Class CreateXCTestCaseClass(const testing::TestCase* testCase,
  * current test invocation.
  */
 void CreateGoogleTestTests() {
-  NSString* masterTestCaseName = NSStringFromClass([GoogleTests class]);
+  NSString* mainTestCaseName = NSStringFromClass([GoogleTests class]);
 
   // Initialize GoogleTest but don't run the tests yet.
   int argc = 1;
-  const char* argv[] = {[masterTestCaseName UTF8String]};
+  const char* argv[] = {[mainTestCaseName UTF8String]};
   testing::InitGoogleTest(&argc, const_cast<char**>(argv));
 
   // Convert XCTest's testToRun set to the equivalent --gtest_filter flag.
   //
   // Note that we only set forceAllTests to true if the user specifically
   // focused on GoogleTests. This prevents XCTest double-counting test cases
   // (and failures) when a user asks for all tests.
-  NSSet<NSString*>* allTests = [NSSet setWithObject:masterTestCaseName];
+  NSSet<NSString*>* allTests = [NSSet setWithObject:mainTestCaseName];
   NSSet<NSString*>* testsToRun = LoadXCTestConfigurationTestsToRun();
   if (testsToRun) {
     if ([allTests isEqual:testsToRun]) {
@@ -379,13 +379,13 @@ void CreateGoogleTestTests() {
   }
 
   // Create XCTestCases and populate the testInfosByKey map
-  const testing::UnitTest* master = testing::UnitTest::GetInstance();
+  const testing::UnitTest* main = testing::UnitTest::GetInstance();
   NSMutableDictionary<NSString*, NSValue*>* infoMap =
-      [NSMutableDictionary dictionaryWithCapacity:master->total_test_count()];
+      [NSMutableDictionary dictionaryWithCapacity:main->total_test_count()];
 
-  int testCases = master->total_test_case_count();
+  int testCases = main->total_test_case_count();
   for (int i = 0; i < testCases; i++) {
-    const testing::TestCase* testCase = master->GetTestCase(i);
+    const testing::TestCase* testCase = main->GetTestCase(i);
     CreateXCTestCaseClass(testCase, infoMap);
   }
   testInfosByKey = infoMap;
@@ -425,8 +425,8 @@ + (XCTestSuite*)defaultTestSuite {
 - (void)testGoogleTestsActuallyRun {
   // This whole mechanism is sufficiently tricky that we should verify that the
   // build actually plumbed this together correctly.
-  const testing::UnitTest* master = testing::UnitTest::GetInstance();
-  XCTAssertGreaterThan(master->total_test_case_count(), 0);
+  const testing::UnitTest* main = testing::UnitTest::GetInstance();
+  XCTAssertGreaterThan(main->total_test_case_count(), 0);
 }
 
 @end

diff --git a/README.md b/README.md
@@ -62,8 +62,8 @@ source snapshot or unreleased branch, use Podfile directives like the following:
 
 To access FirebaseFirestore via a branch:
 ```ruby
-pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
-pod 'FirebaseFirestore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'master'
+pod 'FirebaseCore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'main'
+pod 'FirebaseFirestore', :git => 'https://github.com/firebase/firebase-ios-sdk.git', :branch => 'main'
 ```
 
 To access FirebaseMessaging via a checked-out version of the firebase-ios-sdk repo:
@@ -146,7 +146,7 @@ For information about managing headers and imports, see [HeadersImports](Headers
 ### Code Formatting
 
 To ensure that the code is formatted consistently, run the script
-[./scripts/check.sh](https://github.com/firebase/firebase-ios-sdk/blob/master/scripts/check.sh)
+[./scripts/check.sh](https://github.com/firebase/firebase-ios-sdk/blob/main/scripts/check.sh)
 before creating a pull request (PR).
 
 GitHub Actions will verify that any code changes are done in a style-compliant