Skip to content

Commit

Permalink
Merge pull request #1177 from firebase/mc/renme
Browse files Browse the repository at this point in the history
rename master to main
  • Loading branch information
morganchen12 authored Dec 21, 2023
2 parents 69a6016 + 09f62d6 commit 88f0a87
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/anonymousauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Anonymous Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -12,7 +12,7 @@ on:
- 'FirebaseAnonymousAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/auth.yml'
- 'FirebaseAuthUI/**'
- 'test.sh'
- 'FirebaseAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/auth.yml'
- 'FirebaseAuthUI/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Database

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/database.yml'
- 'FirebaseDatabaseUI/**'
- 'test.sh'
- 'FirebaseDatabaseUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/database.yml'
- 'FirebaseDatabaseUI/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/emailauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Email Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -12,7 +12,7 @@ on:
- 'FirebaseEmailAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/facebookauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Facebook Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -12,7 +12,7 @@ on:
- 'FirebaseFacebookAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Firestore

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/firestore.yml'
- 'FirebaseFirestoreUI/**'
- 'test.sh'
- 'FirebaseFirestoreUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/firestore.yml'
- 'FirebaseFirestoreUI/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/googleauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Google Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -11,7 +11,7 @@ on:
- 'test.sh'
- 'FirebaseGoogleAuthUI.podspec'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/oauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: OAuth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -12,7 +12,7 @@ on:
- 'FirebaseOAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phoneauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Phone Auth

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand All @@ -12,7 +12,7 @@ on:
- 'FirebasePhoneAuthUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'FirebaseAuthUI/**'
- 'FirebaseAuthUI.podspec'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Sample

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/sample.yml'
- 'Firebase*UI/**'
- '*.podspec'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/storage.yml'
- 'Firebase*UI/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Storage

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/storage.yml'
- 'FirebaseStorageUI/**'
- 'test.sh'
- 'FirebaseStorageUI.podspec'
- 'Package.swift'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/storage.yml'
- 'FirebaseStorageUI/**'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAuthUI/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ style, and it is open source, so you aren't constrained in realizing the user
experience you want.

Compatible FirebaseUI Auth clients are also available for
[Android](https://github.com/firebase/firebaseui-android/tree/master/auth)
[Android](https://github.com/firebase/firebaseui-android/tree/main/auth)
and [Web](https://github.com/firebase/firebaseui-web/).

## Table of Contents
Expand Down Expand Up @@ -273,7 +273,7 @@ authUI?.customStringsBundle = NSBundle.mainBundle() // Or any custom bundle.
authUI.customStringsBundle = [NSBundle mainBundle]; // Or any custom bundle.
```

The bundle should include [.strings](https://github.com/firebase/FirebaseUI-iOS/blob/master/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings)
The bundle should include [.strings](https://github.com/firebase/FirebaseUI-iOS/blob/main/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings)
files that have the same names as the default files, namely `FirebaseAuthUI`,
`FirebaseGoogleAuthUI`, and `FirebaseFacebookAuthUI`. Each string in these files
should have the same key as its counterpart in the default `.strings` files.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Additionally, FirebaseUI simplifies Firebase authentication by providing easy to

FirebaseUI clients are also available for [Android](https://github.com/firebase/FirebaseUI-Android) and [web](https://github.com/firebase/firebaseui-web).

![](https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/samples/demo.gif)
![](https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/main/samples/demo.gif)

## Installing FirebaseUI for iOS

Expand Down

0 comments on commit 88f0a87

Please sign in to comment.