Skip to content

Commit

Permalink
#1231 Fix typos across the codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerluan authored Jan 18, 2024
2 parents 5fdf97e + 6cc446f commit c5491f4
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Style/RedundantReturn:
Style/IfUnlessModifier:
Enabled: false

# and and or is okay
# "and" and "or" are okay
Style/AndOr:
Enabled: true
EnforcedStyle: conditionals
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ name = UI.input("What's your name? ")
if UI.confirm("Are you '#{name}'?")
UI.success "Oh yeah"
else
UI.error "Wups, invalid"
UI.error "Whoops, invalid"
end

UI.password("Your password please: ") # password inputs are hidden
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/lanes.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ app_identifier "com.used.id"
app_identifier "com.ignored.id"
```

the `app_identfier` will be `"com.used.id"` and the second value will be ignored. The `for_lane` and `for_platform` configuration blocks provide a limited exception to this rule.
the `app_identifier` will be `"com.used.id"` and the second value will be ignored. The `for_lane` and `for_platform` configuration blocks provide a limited exception to this rule.

All configuration files (Appfile, Matchfile, Screengrabfile, etc.) can use `for_lane` and `for_platform` blocks to control (and override) configuration values for those circumstances.

Expand Down
2 changes: 1 addition & 1 deletion docs/app-store-connect-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $ bundle exec fastlane match appstore \
```

Please note that `key_content` and `key_filepath` described in `app_store_connect_api_key` action are invalid both in hash and in JSON file.
View [Token code on Github](https://github.com/fastlane/fastlane/blob/master/spaceship/lib/spaceship/connect_api/token.rb)
View [Token code on GitHub](https://github.com/fastlane/fastlane/blob/master/spaceship/lib/spaceship/connect_api/token.rb)

### Using _fastlane_ API Key JSON file

Expand Down
2 changes: 1 addition & 1 deletion docs/best-practices/continuous-integration/bamboo.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Then you could use the following regex to ignore these commits


## Setting repository remote
By default bamboo will do an anonymous shallow clone of the repo. This will not preserve the `git remote` information nor the list of tags. If you are using bamboo to create commits you may want to use a code block similar to the following:
Bamboo will do an anonymous shallow clone of the repo by default. This will preserve neither the `git remote` information nor the list of tags. If you are using bamboo to create commits you may want to use a code block similar to the following:


```ruby
Expand Down
4 changes: 2 additions & 2 deletions docs/best-practices/continuous-integration/codemagic.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The following **environment variables** need to be added to your workflow for *f

- `MATCH_PASSWORD` - the password used to encrypt/decrypt the repository used to store your distribution certificates and provisioning profiles.
- `MATCH_KEYCHAIN` - an arbitrary name to use for the keychain on the Codemagic build server, e.g "fastlane_keychain"
- `MATCH_SSH_KEY` - an SSH private key used for cloning the Match repository that contains your distribution certificates and provisioning profiles. The public key should be added to your Github account. See [here](https://docs.codemagic.io/configuration/access-private-git-submodules/) for more information about accessing Git dependencies with SSH keys.
- `MATCH_SSH_KEY` - an SSH private key used for cloning the Match repository that contains your distribution certificates and provisioning profiles. The public key should be added to your GitHub account. See [here](https://docs.codemagic.io/configuration/access-private-git-submodules/) for more information about accessing Git dependencies with SSH keys.
- `APP_STORE_CONNECT_PRIVATE_KEY` - the App Store Connect API key. Copy the entire contents of the .p8 file and paste into the environment variable value field.
- `APP_STORE_CONNECT_KEY_IDENTIFIER` - the key identifier of your App Store Connect API key.
- `APP_STORE_CONNECT_ISSUER_ID` - the issuer of your App Store Connect API key.
Expand All @@ -33,7 +33,7 @@ workflows:
It is recommended to run your *fastlane* lanes using the `codemagic.yaml` configuration file.

You should install your depenpendencies with `bundle install` and then execute the *fastlane* lane with `bundle exec fastlane <lane_name>` as follows:
You should install your dependencies with `bundle install` and then execute the *fastlane* lane with `bundle exec fastlane <lane_name>` as follows:

```yaml
scripts:
Expand Down
4 changes: 2 additions & 2 deletions docs/best-practices/continuous-integration/jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ Under the hood `setup_jenkins` configures other actions like: _gym_, _scan_, `xc

You can use `commit_version_bump` or `git_commit` action to commit changes to your repository in your fastlane setup. When you are using webhooks to trigger your build on a push this will cause an infinite loop of triggering builds.

#### Gitlab
#### GitLab

When you are using Gitlab you will need the [GitLab Plugin](https://plugins.jenkins.io/gitlab-plugin). Inside the job you want to configure you go to `Build Triggers > Build when a change is pushed to GitLab > Enable [ci-skip]`.
When you are using GitLab you will need the [GitLab Plugin](https://plugins.jenkins.io/gitlab-plugin). Inside the job you want to configure you go to `Build Triggers > Build when a change is pushed to GitLab > Enable [ci-skip]`.
When you include `[ci-skip]` in your build this commit won't trigger the build in jenkins at all.

**Example**
Expand Down
4 changes: 2 additions & 2 deletions docs/best-practices/xcodebuild-formatters.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ scan(
xcodebuild_formatter: "/custom/path/to/xcbeautify"
)

# Specifify your own custom formatter
# Specify your own custom formatter
scan(
xcodebuild_formatter: "/custom/path/to/my_formatter"
)
Expand Down Expand Up @@ -64,7 +64,7 @@ $ brew install xcbeautify

#### xcpretty

Historticaly, _fastlane_ was tightly integrated with [xcpretty](https://github.com/xcpretty/xcpretty). `xcpretty` is a RubyGem and a dependency of _fastlane_. This was the best option for _fastlane_ as there were no extra steps for installing or using this formatter.
Historically, _fastlane_ was tightly integrated with [xcpretty](https://github.com/xcpretty/xcpretty). `xcpretty` is a RubyGem and a dependency of _fastlane_. This was the best option for _fastlane_ as there were no extra steps for installing or using this formatter.

`xcpretty` also did more than formatting. It used the `xcodebuild` output to:

Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/android/screenshots.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class ExampleInstrumentedTest {
}

```
There is an [example project](https://github.com/fastlane/fastlane/tree/master/screengrab/example/src/androidTest/java/tools/fastlane/localetester) showing how to use use JUnit 3 or 4 and Espresso with the screengrab Java library to capture screenshots during a UI test run.
There is an [example project](https://github.com/fastlane/fastlane/tree/master/screengrab/example/src/androidTest/java/tools/fastlane/localetester) showing how to use JUnit 3 or 4 and Espresso with the screengrab Java library to capture screenshots during a UI test run.

Using JUnit 4 is preferable because of its ability to perform actions before and after the entire test class is run. This means you will change the device's locale far fewer times when compared with JUnit 3 running those commands before and after each test method.

Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/ios/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The most interesting file is `fastlane/Fastfile`, which contains all the informa

### What's next?

_fastlane_ created all the required files for you. Now you can go ahead and customise _fastlane_ to generate screenshots, or automatically distribute new builds, and much, much more. Here're some examples:
_fastlane_ created all the required files for you. Now you can go ahead and customise _fastlane_ to generate screenshots, or automatically distribute new builds, and much, much more. Here are some examples:

- [Generate localized iOS screenshots for the App Store](screenshots.md)
- [Automatic iOS Beta deployment](beta-deployment.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/includes/google-credentials.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
1. If you don't have an existing project or prefer to have a dedicated one for _fastlane_, [create a new one here](https://console.cloud.google.com/projectcreate/?hl=en) and follow the instructions
1. Open [Service Accounts on Google Cloud](https://console.cloud.google.com/iam-admin/serviceaccounts?hl=en) and select the project you'd like to use
1. Click the **CREATE SERVICE ACCOUNT** button at the top of the **Google Cloud Platform Console** page
1. Verify that you are on the correct Google Cloud Platform Project by looking for the **Developer Account ID** from earlier within the light gray text in the second input, preceding `.iam.gserviceaccount.com`, or by checking the project name in the navigaton bar. If not, open the picker in the top navigation bar, and find the right one.
1. Verify that you are on the correct Google Cloud Platform Project by looking for the **Developer Account ID** from earlier within the light gray text in the second input, preceding `.iam.gserviceaccount.com`, or by checking the project name in the navigation bar. If not, open the picker in the top navigation bar, and find the right one.
1. Provide a `Service account name` (e.g. fastlane-supply)
1. Copy the generated email address that is noted below the `Service account-ID` field for later use
1. Click **DONE** (don't click **CREATE AND CONTINUE** as the optional steps such as granting access are not needed): <img src="/img/getting-started/android/creating-service-account.png" width="700" />
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fastlane release
👻 | Integrates with all major CI systems
🖥 | Supports iOS, Mac, and Android apps
🔧 | Extend and customise _fastlane_ to fit your needs, you're not dependent on anyone
💭 | Never remember any commands any more, just _fastlane_
💭 | Never remember any commands anymore, just _fastlane_
🚢 | Deploy from any computer, including a CI server

## Getting Started
Expand Down

0 comments on commit c5491f4

Please sign in to comment.