From 19afd8c9ca0d755dcee91b7e0c62941ae0caaaba Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Tue, 16 Jan 2024 01:31:22 +0600 Subject: [PATCH] Rename more references --- .github/ISSUE_TEMPLATE/report_issue.yml | 2 +- .github/ISSUE_TEMPLATE/request_feature.yml | 2 +- .github/workflows/build_push.yml | 52 ++++++++----------- CONTRIBUTING.md | 13 +++-- README.md | 12 ++--- .../data/updater/AppUpdateChecker.kt | 4 +- .../interactor/GetApplicationRelease.kt | 4 +- settings.gradle.kts | 2 +- 8 files changed, 39 insertions(+), 52 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml index 3e406d2f0..fedcca8cb 100644 --- a/.github/ISSUE_TEMPLATE/report_issue.yml +++ b/.github/ISSUE_TEMPLATE/report_issue.yml @@ -98,7 +98,7 @@ body: required: true - label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https://mihon.app/docs/guides/troubleshooting/). required: true - - label: I have updated the app to version **[0.15.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**. + - label: I have updated the app to version **[0.15.3](https://github.com/mihonapp/mihon/releases/latest)**. required: true - label: I have updated all installed extensions. required: true diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml index 8a67d4794..ee49ba634 100644 --- a/.github/ISSUE_TEMPLATE/request_feature.yml +++ b/.github/ISSUE_TEMPLATE/request_feature.yml @@ -33,7 +33,7 @@ body: required: true - label: If this is an issue with an official extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/extensions/issues/new/choose). required: true - - label: I have updated the app to version **[0.15.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**. + - label: I have updated the app to version **[0.15.3](https://github.com/mihonapp/mihon/releases/latest)**. required: true - label: I will fill out all of the requested information in this form. required: true diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 501227639..53957f736 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -40,13 +40,13 @@ jobs: # Sign APK and create release for tags - name: Get tag name - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' run: | set -x echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - name: Sign APK - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' uses: r0adkll/sign-android-release@v1 with: releaseDirectory: app/build/outputs/apk/standard/release @@ -56,36 +56,36 @@ jobs: keyPassword: ${{ secrets.KEY_PASSWORD }} - name: Clean up build artifacts - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' run: | set -e - mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk tachiyomi-${{ env.VERSION_TAG }}.apk - sha=`sha256sum tachiyomi-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` + mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk mihon-${{ env.VERSION_TAG }}.apk + sha=`sha256sum mihon-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` echo "APK_UNIVERSAL_SHA=$sha" >> $GITHUB_ENV - cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk - sha=`sha256sum tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` + cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk mihon-arm64-v8a-${{ env.VERSION_TAG }}.apk + sha=`sha256sum mihon-arm64-v8a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` echo "APK_ARM64_V8A_SHA=$sha" >> $GITHUB_ENV - cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk - sha=`sha256sum tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` + cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk mihon-armeabi-v7a-${{ env.VERSION_TAG }}.apk + sha=`sha256sum mihon-armeabi-v7a-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` echo "APK_ARMEABI_V7A_SHA=$sha" >> $GITHUB_ENV - cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk tachiyomi-x86-${{ env.VERSION_TAG }}.apk - sha=`sha256sum tachiyomi-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` + cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk mihon-x86-${{ env.VERSION_TAG }}.apk + sha=`sha256sum mihon-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` echo "APK_X86_SHA=$sha" >> $GITHUB_ENV - cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk - sha=`sha256sum tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` + cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk mihon-x86_64-${{ env.VERSION_TAG }}.apk + sha=`sha256sum mihon-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'` echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV - name: Create Release - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' uses: softprops/action-gh-release@v1 with: tag_name: ${{ env.VERSION_TAG }} - name: Tachiyomi ${{ env.VERSION_TAG }} + name: Mihon ${{ env.VERSION_TAG }} body: | --- @@ -98,23 +98,15 @@ jobs: | armeabi-v7a | ${{ env.APK_ARMEABI_V7A_SHA }} | x86 | ${{ env.APK_X86_SHA }} | | x86_64 | ${{ env.APK_X86_64_SHA }} | + + If you are unsure which version to choose then go with mihon-${{ env.VERSION_TAG }}.apk files: | - tachiyomi-${{ env.VERSION_TAG }}.apk - tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk - tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk - tachiyomi-x86-${{ env.VERSION_TAG }}.apk - tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk + mihon-${{ env.VERSION_TAG }}.apk + mihon-arm64-v8a-${{ env.VERSION_TAG }}.apk + mihon-armeabi-v7a-${{ env.VERSION_TAG }}.apk + mihon-x86-${{ env.VERSION_TAG }}.apk + mihon-x86_64-${{ env.VERSION_TAG }}.apk draft: true prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - update-website: - needs: [build] - runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi' - steps: - - name: Trigger Netlify build hook - run: curl -s -X POST -d {} "https://api.netlify.com/build_hooks/${TOKEN}" - env: - TOKEN: ${{ secrets.NETLIFY_HOOK_RELEASE }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46c827931..ed97d06bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/tachiyomiorg/tachiyomi#issues-feature-requests-and-contributing). +Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/mihonapp/mihon#issues-feature-requests-and-contributing). --- @@ -9,7 +9,7 @@ Thanks for your interest in contributing to Mihon! Pull requests are welcome! -If you're interested in taking on [an open issue](https://github.com/tachiyomiorg/tachiyomi/issues), please comment on it so others are aware. +If you're interested in taking on [an open issue](https://github.com/mihonapp/mihon/issues), please comment on it so others are aware. You do not need to ask for permission nor an assignment. ## Prerequisites @@ -39,16 +39,15 @@ Translations are done externally via Weblate. See [our website](https://mihon.ap # Forks -Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/tachiyomiorg/tachiyomi/blob/master/LICENSE). +Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/mihonapp/mihon/blob/master/LICENSE). When creating a fork, remember to: - To avoid confusion with the main app: - Change the app name - Change the app icon - - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt) + - Change or disable the [app update checker](https://github.com/mihonapp/mihon/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt) - To avoid installation conflicts: - - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) + - Change the `applicationId` in [`build.gradle.kts`](https://github.com/mihonapp/mihon/blob/master/app/build.gradle.kts) - To avoid having your data polluting the main app's analytics and crash report services: - - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/standard/google-services.json) with your own - - If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) with your own + - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/mihonapp/mihon/blob/master/app/src/standard/google-services.json) with your own diff --git a/README.md b/README.md index 7c3618eff..7e863fd4a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ | Build | Stable | Weekly Preview | Contribute | Support Server | |-------|----------|---------|------------|---------| -| [![CI](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml/badge.svg)](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview 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/1195734228319617024.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/mihon) | +| [![CI](https://github.com/mihonapp/mihon/actions/workflows/build_push.yml/badge.svg)](https://github.com/mihonapp/mihon/actions/workflows/build_push.yml) | [![stable release](https://img.shields.io/github/release/mihonapp/mihon.svg?maxAge=3600&label=download)](https://github.com/mihonapp/mihon/releases) | [![latest preview build](https://img.shields.io/github/v/release/mihonapp/mihon-preview.svg?maxAge=3600&label=download)](https://github.com/mihonapp/mihon-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/1195734228319617024.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/mihon) | # ![app icon](./.github/readme-images/app-icon.png)Mihon Mihon is a free and open source manga reader for Android 8.0 and above. @@ -18,9 +18,9 @@ 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/tachiyomiorg/tachiyomi/releases). +Get the app from our [releases page](https://github.com/mihonapp/mihon/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/tachiyomi-preview/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/mihonapp/mihon-preview/releases). ## Issues, Feature Requests and Contributing @@ -28,7 +28,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://mihon.app/docs/faq/general), the [changelog](https://mihon.app/changelogs/) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).** +1. **Before reporting a new issue, take a look at the [FAQ](https://mihon.app/docs/faq/general), the [changelog](https://mihon.app/changelogs/) and the already opened [issues](https://github.com/mihonapp/mihon/issues).** 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/1195734228319617024.svg)](https://discord.gg/mihon)
@@ -43,10 +43,6 @@ Please make sure to read the full guidelines. Your issue may be closed without w * If it could be device-dependent, try reproducing on another device (if possible) * Don't group unrelated requests into one issue -DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71 - -DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75 -
Feature Requests diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt index c50524766..2197dd992 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt @@ -44,9 +44,9 @@ class AppUpdateChecker { val GITHUB_REPO: String by lazy { if (BuildConfig.PREVIEW) { - "tachiyomiorg/tachiyomi-preview" + "mihonapp/mihon-preview" } else { - "tachiyomiorg/tachiyomi" + "mihonapp/mihon" } } diff --git a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt index 2f7709f39..bf966fa12 100644 --- a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt +++ b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt @@ -54,11 +54,11 @@ class GetApplicationRelease( // Removes prefixes like "r" or "v" val newVersion = versionTag.replace("[^\\d.]".toRegex(), "") return if (isPreview) { - // Preview builds: based on releases in "tachiyomiorg/tachiyomi-preview" repo + // Preview builds: based on releases in "mihonapp/mihon-preview" repo // tagged as something like "r1234" newVersion.toInt() > commitCount } else { - // Release builds: based on releases in "tachiyomiorg/tachiyomi" repo + // Release builds: based on releases in "mihonapp/mihon" repo // tagged as something like "v0.1.2" val oldVersion = versionName.replace("[^\\d.]".toRegex(), "") diff --git a/settings.gradle.kts b/settings.gradle.kts index 4db52ce31..5aafcad34 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,7 +35,7 @@ dependencyResolutionManagement { } } -rootProject.name = "Tachiyomi" +rootProject.name = "Mihon" include(":app") include(":i18n") include(":source-api")