diff --git a/README.md b/README.md index abdabaee6db2..b75475e50ee5 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ If you're a developer wanting to contribute, read on. ## Build Instructions ## -1. Make sure you've installed [Android Studio](https://developer.android.com/studio/index.html). -1. Install npm using [Node Version Manager](https://github.com/nvm-sh/nvm)(nvm), as described in step one from the [Block Editor Quickstart guide](https://developer.wordpress.org/block-editor/tutorials/devenv/#quickstart) +1. Make sure you've installed [Android Studio](https://developer.android.com/studio). +1. Install npm using [Node Version Manager](https://github.com/nvm-sh/nvm)(nvm), as described in step one from the [Block Editor Quickstart guide](https://developer.wordpress.org/block-editor/getting-started/devenv/#quickstart) 1. `cd WordPress-Android` to enter the working directory. 1. `cp gradle.properties-example gradle.properties` to set up the sample app credentials file. 1. In Android Studio, open the project from the local repository. This will auto-generate `local.properties` with the SDK location. @@ -16,7 +16,7 @@ If you're a developer wanting to contribute, read on. Notes: -* While loading/building the app in Android Studio ignore the prompt to update the gradle plugin version as that will probably introduce build errors. On the other hand, feel free to update if you are planning to work on ensuring the compatibility of the newer version. +* While loading/building the app in Android Studio, ignore the prompt to update the Gradle plugin version, as that will probably introduce build errors. On the other hand, feel free to update if you are planning to work on ensuring the compatibility of the newer version. ## Build and Test ## @@ -92,7 +92,7 @@ in the `libs/` directory comes from external libraries, which might be covered by a different license compatible with the GPLv2. [1]: https://play.google.com/store/apps/details?id=org.wordpress.android -[3]: http://developer.android.com/sdk/installing/studio.html +[3]: https://developer.android.com/studio [4]: https://make.wordpress.org/chat/ [5]: https://developer.wordpress.com/apps/ [6]: https://developer.wordpress.com/docs/oauth2/ diff --git a/docs/coding-style.md b/docs/coding-style.md index 27e04260c6e5..e9af04022ec7 100644 --- a/docs/coding-style.md +++ b/docs/coding-style.md @@ -1,11 +1,11 @@ # Coding Style -Our code style guidelines are based on the [Android Code Style Guidelines for Contributors](https://source.android.com/source/code-style.html). We only changed a few rules: +Our code style guidelines are based on the [Android Code Style Guidelines for Contributors](https://source.android.com/docs/setup/contribute/code-style). We only changed a few rules: * Line length is 120 characters * FIXME must not be committed in the repository use TODO instead. FIXME can be used in your own local repository only. -On top of the Android linter rules (best run for this project using `./gradlew lintWordPressVanillaRelease`), we use two linters: [Checkstyle](http://checkstyle.sourceforge.net/) (for Java and some language-independent custom project rules), and [detekt](https://detekt.github.io/detekt/) (for Kotlin). +On top of the Android linter rules (best run for this project using `./gradlew lintWordPressVanillaRelease`), we use two linters: [Checkstyle](https://checkstyle.sourceforge.io/) (for Java and some language-independent custom project rules), and [detekt](https://detekt.dev/) (for Kotlin). ## Checkstyle You can run checkstyle via a gradle command: