diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml index 5185c2c64..7cb064d03 100644 --- a/.github/ISSUE_TEMPLATE/report_issue.yml +++ b/.github/ISSUE_TEMPLATE/report_issue.yml @@ -53,7 +53,7 @@ body: label: Komikku version description: You can find your Komikku version in **More → About**. placeholder: | - Example: "1.11.2" + Example: "1.12.1" validations: required: true @@ -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 **[1.11.2](https://github.com/komikku-app/komikku/releases/latest)**. + - label: I have updated the app to version **[1.12.1](https://github.com/komikku-app/komikku/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 fcb79a274..274bfd271 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/komikku-app/extensions/issues/new/choose). required: true - - label: I have updated the app to version **[1.11.2](https://github.com/komikku-app/komikku/releases/latest)**. + - label: I have updated the app to version **[1.12.1](https://github.com/komikku-app/komikku/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_preview.yml b/.github/workflows/build_preview.yml index 42e3da9da..e81bbd7ca 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -215,17 +215,17 @@ jobs: tag_name: ${{ needs.prepare-build.outputs.TAG_NAME }} name: Komikku Preview ${{ needs.prepare-build.outputs.TAG_NAME }} (${{ needs.prepare-build.outputs.VERSION_TAG }}) body: | - ### What's Changed - #### New + #### What's Changed + ##### New - #### Improve + ##### Improve - #### Fix - - **Full Changelog**: https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.TAG_NAME }} + ##### Fix ${{ needs.prepare-build.outputs.COMMIT_LOGS }} + **Full Changelog**: [${{ needs.prepare-build.outputs.TAG_NAME }}](https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.TAG_NAME }}) + --- ### Checksums diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 4f568f25b..cfa43ee17 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -191,18 +191,18 @@ jobs: tag_name: ${{ needs.prepare-build.outputs.VERSION_TAG }} name: Komikku ${{ needs.prepare-build.outputs.VERSION_TAG }} body: | - ### What's Changed - #### New + #### What's Changed + ##### New - #### Improve + ##### Improve - #### Fix + ##### Fix + + ${{ needs.prepare-build.outputs.COMMIT_LOGS }} ##### Based on - **Full Changelog**: https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.VERSION_TAG }} - - ${{ needs.prepare-build.outputs.COMMIT_LOGS }} + **Full Changelog**: [${{ needs.prepare-build.outputs.VERSION_TAG }}](https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.VERSION_TAG }}) --- diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6337809ea..710c252b5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,7 +33,7 @@ android { applicationId = "app.komikku" versionCode = 71 - versionName = "1.12.0" + versionName = "1.12.1" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"") 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 fe7f6cbe2..92fc38e22 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 @@ -16,11 +16,6 @@ class AppUpdateChecker( private val getApplicationRelease: GetApplicationRelease by injectLazy() suspend fun checkForUpdate(context: Context, forceCheck: Boolean = false): GetApplicationRelease.Result { - // Disable app update checks for older Android versions that we're going to drop support for - // if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - // return GetApplicationRelease.Result.OsTooOld - // } - return withIOContext { val result = getApplicationRelease.await( GetApplicationRelease.Arguments( diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml index 7cbc1e067..bfab3baad 100644 --- a/app/src/main/res/raw/changelog_release.xml +++ b/app/src/main/res/raw/changelog_release.xml @@ -1,6 +1,6 @@ - + [b]New:[/b] Error screen [b]New:[/b] Hidden categories [b]New:[/b] Range-selection for Migration diff --git a/data/src/main/java/tachiyomi/data/release/GithubRelease.kt b/data/src/main/java/tachiyomi/data/release/GithubRelease.kt index e320d5495..2417325b3 100644 --- a/data/src/main/java/tachiyomi/data/release/GithubRelease.kt +++ b/data/src/main/java/tachiyomi/data/release/GithubRelease.kt @@ -48,7 +48,7 @@ val gitHubUsernameMentionRegex = * to: [komikku-app/komikku@23d862d17...48fb4a2e6](https://github.com/komikku-app/komikku/compare/23d862d17...48fb4a2e6) */ val gitHubCommitsCompareRegex = - """https://github.com/(?[^/]+)/(?[^/]+)/compare/(?[0-9a-f.rv]+)\.\.\.(?[0-9a-f.rv]+)""" + """(\[[^]+]]\()?https://github.com/(?[^/]+)/(?[^/]+)/compare/(?[0-9a-f.rv]+)\.\.\.(?[0-9a-f.rv]+)\)?""" .toRegex(RegexOption.IGNORE_CASE) // KMK <-- 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 1bb876ed9..07030c287 100644 --- a/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt +++ b/domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt @@ -117,6 +117,7 @@ class GetApplicationRelease( if (newSemVer[index] > i) { return true } + if (newSemVer[index] < i) return false } false diff --git a/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt b/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt index 7c573fc31..e23e3884b 100644 --- a/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt +++ b/domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt @@ -16,9 +16,9 @@ import java.time.Instant class GetApplicationReleaseTest { - lateinit var getApplicationRelease: GetApplicationRelease - lateinit var releaseService: ReleaseService - lateinit var preference: Preference + private lateinit var getApplicationRelease: GetApplicationRelease + private lateinit var releaseService: ReleaseService + private lateinit var preference: Preference @BeforeEach fun beforeEach() {