From f38df6998315bbe9b0330b8ac79ab2a615bc0951 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 15 Dec 2020 15:56:16 -0500 Subject: [PATCH] Update app repo URL (cherry picked from commit 04fff91e238e89b181035b9355e1f68644fa31ce) # Conflicts: # .github/workflows/TachiyomiSY-Release-Builder.yml # README.md # app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt --- .github/CONTRIBUTING.md | 8 ++++---- .github/workflows/TachiyomiSY-Release-Builder.yml | 13 ++++--------- README.md | 4 ++-- .../data/updater/github/GithubUpdateChecker.kt | 4 ++-- .../eu/kanade/tachiyomi/ui/more/AboutController.kt | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0370da04f..6376c906c 100755 --- 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/TachiyomiSY-Release-Builder.yml b/.github/workflows/TachiyomiSY-Release-Builder.yml index 0a31840ed..74d6b3b31 100644 --- a/.github/workflows/TachiyomiSY-Release-Builder.yml +++ b/.github/workflows/TachiyomiSY-Release-Builder.yml @@ -18,7 +18,7 @@ jobs: uses: gradle/wrapper-validation-action@v1 build: - name: Build app release + name: Build app needs: check_wrapper if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')" runs-on: ubuntu-latest @@ -60,21 +60,16 @@ jobs: dependencies-cache-enabled: true configuration-cache-enabled: true - - name: Sign Android Release + - name: Sign APK uses: r0adkll/sign-android-release@v1 with: - # The directory to find your release to sign releaseDirectory: app/build/outputs/apk/standard/release - # The key used to sign your release in base64 encoded format signingKeyBase64: ${{ secrets.SIGNING_KEY }} - # The key alias alias: ${{ secrets.ALIAS }} - # The password to the keystore keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - # The password for the key keyPassword: ${{ secrets.KEY_PASSWORD }} - - name: Create Release + - name: Create release id: create_release uses: actions/create-release@v1 env: @@ -85,7 +80,7 @@ jobs: draft: true prerelease: false - - name: Upload Release APK + - name: Upload APK to release uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 6de17e620..489dc5a07 100644 --- a/README.md +++ b/README.md @@ -93,9 +93,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 f82ca7ad5..e98fbb1a6 100755 --- 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 @@ -37,11 +37,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/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt index 559fe9123..0ea34531d 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 @@ -116,7 +116,7 @@ class AboutController : SettingsController() { preference { key = "pref_about_label_original_tachiyomi_github" title = "Original Tachiyomi 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())