From 04fff91e238e89b181035b9355e1f68644fa31ce Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 15 Dec 2020 15:56:16 -0500 Subject: [PATCH] Update app repo URL --- .github/CONTRIBUTING.md | 8 ++++---- .github/workflows/build.yml | 8 ++++---- README.md | 10 +++++----- .../data/updater/github/GithubUpdateChecker.kt | 8 ++++---- .../tachiyomi/ui/main/WhatsNewDialogController.kt | 2 +- .../eu/kanade/tachiyomi/ui/more/AboutController.kt | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0370da04f..6376c906c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,11 +1,11 @@ -1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).** +1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/tachiyomiorg/tachiyomi/releases) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).** 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) 3. What is your type of issue? * [Catalogue request](#catalogue-requests) * [Bugs](#bugs) * [Feature requests](#feature-requests) * [Translations](https://tachiyomi.org/help/contribution/#translation) -4. After following 1. and 3. you can [open your issue](https://github.com/inorichi/tachiyomi/issues/new) +4. After following 1. and 3. you can [open your issue](https://github.com/tachiyomiorg/tachiyomi/issues/new) *** @@ -23,9 +23,9 @@ * For large logs use http://pastebin.com/ (or similar) * Don't group unrelated requests into one issue -DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71 +DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71 -DON'T: https://github.com/inorichi/tachiyomi/issues/75 +DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75 # Feature requests diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c0e185a9..8a01cbfbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,14 +55,14 @@ jobs: # Sign APK and create release for tags - name: Get tag name - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' id: get_tag_name run: | set -x echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - name: Sign APK - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' uses: r0adkll/sign-android-release@v1 with: releaseDirectory: app/build/outputs/apk/standard/release @@ -72,7 +72,7 @@ jobs: keyPassword: ${{ secrets.KEY_PASSWORD }} - name: Create release - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' id: create_release uses: actions/create-release@v1 env: @@ -84,7 +84,7 @@ jobs: prerelease: false - name: Upload APK to release - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 0322f860f..53874eac6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ | Build | Stable | Weekly Preview | Contribute | Support Server | |-------|----------|---------|------------|---------| -| ![CI](https://github.com/inorichi/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/inorichi/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/android-app-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/android-app-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) | +| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) | # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi @@ -21,7 +21,7 @@ Features include: * Create backups locally to read offline or to your desired cloud service ## Download -Get the app from our [releases page](https://github.com/inorichi/tachiyomi/releases). +Get the app from our [releases page](https://github.com/tachiyomiorg/tachiyomi/releases). If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/android-app-preview/releases). @@ -31,7 +31,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
Issues -1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).** +1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/tachiyomiorg/tachiyomi/releases) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).** 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
@@ -47,9 +47,9 @@ Please make sure to read the full guidelines. Your issue may be closed without w * For large logs use http://pastebin.com/ (or similar) * Don't group unrelated requests into one issue -DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71 +DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71 -DON'T: https://github.com/inorichi/tachiyomi/issues/75 +DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75 diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt index aa01b68e3..b158cac3b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt @@ -9,9 +9,9 @@ class GithubUpdateChecker { private val repo: String by lazy { if (BuildConfig.DEBUG) { - "tachiyomiorg/android-app-preview" + "tachiyomiorg/tachiyomi-preview" } else { - "inorichi/tachiyomi" + "tachiyomiorg/tachiyomi" } } @@ -31,11 +31,11 @@ class GithubUpdateChecker { val newVersion = versionTag.replace("[^\\d.]".toRegex(), "") return if (BuildConfig.DEBUG) { - // Preview builds: based on releases in "tachiyomiorg/android-app-preview" repo + // Preview builds: based on releases in "tachiyomiorg/tachiyomi-preview" repo // tagged as something like "r1234" newVersion.toInt() > BuildConfig.COMMIT_COUNT.toInt() } else { - // Release builds: based on releases in "inorichi/tachiyomi" repo + // Release builds: based on releases in "tachiyomiorg/tachiyomi" repo // tagged as something like "v0.1.2" newVersion != BuildConfig.VERSION_NAME } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt index a831948d1..7497d42ea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt @@ -16,7 +16,7 @@ class WhatsNewDialogController(bundle: Bundle? = null) : DialogController(bundle .title(text = activity!!.getString(R.string.updated_version, BuildConfig.VERSION_NAME)) .positiveButton(android.R.string.ok) .neutralButton(R.string.whats_new) { - val url = "https://github.com/inorichi/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}" + val url = "https://github.com/tachiyomiorg/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}" val intent = Intent(Intent.ACTION_VIEW, url.toUri()) startActivity(intent) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt index 441fa7969..dcb11bcc1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt @@ -72,9 +72,9 @@ class AboutController : SettingsController() { onClick { val url = if (BuildConfig.DEBUG) { - "https://github.com/inorichi/tachiyomi/commits/dev" + "https://github.com/tachiyomiorg/tachiyomi/commits/dev" } else { - "https://github.com/inorichi/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}" + "https://github.com/tachiyomiorg/tachiyomi/releases/tag/v${BuildConfig.VERSION_NAME}" } val intent = Intent(Intent.ACTION_VIEW, url.toUri()) @@ -87,7 +87,7 @@ class AboutController : SettingsController() { titleRes = R.string.notices onClick { - val intent = Intent(Intent.ACTION_VIEW, "https://github.com/inorichi/tachiyomi/blob/dev/PREVIEW_RELEASE_NOTES.md".toUri()) + val intent = Intent(Intent.ACTION_VIEW, "https://github.com/tachiyomiorg/tachiyomi/blob/dev/PREVIEW_RELEASE_NOTES.md".toUri()) startActivity(intent) } } @@ -117,7 +117,7 @@ class AboutController : SettingsController() { preference { key = "pref_about_github" title = "GitHub" - val url = "https://github.com/inorichi/tachiyomi" + val url = "https://github.com/tachiyomiorg/tachiyomi" summary = url onClick { val intent = Intent(Intent.ACTION_VIEW, url.toUri())