Compare commits

...

3 Commits

Author SHA1 Message Date
Jobobby04 2daccb57b5 1.10.4 2024-02-17 18:58:06 -05:00
Jobobby04 e64bddf9d5 Fix crashes related to MangaCover 2024-02-17 18:55:03 -05:00
pabalaba 9f6f15f64d Update workflow dependencies (#310)
* feat: updated build_pull_request actions version

* feat: updated build_push actions version

* feat: updated issue_moderator action version

* feat: updated deprecated arguments in build_pull_request

* feat: updated deprecated arguments in build_push

* feat: removed explicit declaration of gradle version

(cherry picked from commit 170daf9fb2e566fea598eb5dc0cd710f979c7b7a)

# Conflicts:
#	.github/workflows/build_pull_request.yml
#	.github/workflows/build_push.yml
2024-02-17 18:50:58 -05:00
8 changed files with 21 additions and 12 deletions
+2 -2
View File
@@ -53,7 +53,7 @@ body:
label: TachiyomiSY version label: TachiyomiSY version
description: You can find your TachiyomiSY version in **More → About**. description: You can find your TachiyomiSY version in **More → About**.
placeholder: | placeholder: |
Example: "1.10.3" Example: "1.10.4"
validations: validations:
required: true required: true
@@ -96,7 +96,7 @@ body:
required: true required: true
- label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https:/mihon.app/docs/guides/troubleshooting/). - label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https:/mihon.app/docs/guides/troubleshooting/).
required: true required: true
- label: I have updated the app to version **[1.10.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**. - label: I have updated the app to version **[1.10.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
required: true required: true
- label: I have updated all installed extensions. - label: I have updated all installed extensions.
required: true required: true
+1 -1
View File
@@ -31,7 +31,7 @@ body:
required: true required: true
- label: I have written a short but informative title. - label: I have written a short but informative title.
required: true required: true
- label: I have updated the app to version **[1.10.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**. - label: I have updated the app to version **[1.10.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
required: true required: true
- label: I will fill out all of the requested information in this form. - label: I will fill out all of the requested information in this form.
required: true required: true
+5 -4
View File
@@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v2
- name: Setup Android SDK - name: Setup Android SDK
run: | run: |
@@ -30,6 +30,9 @@ jobs:
java-version: 17 java-version: 17
distribution: adopt distribution: adopt
- name: Set up gradle
uses: gradle/actions/setup-gradle@v3
# SY <-- # SY <--
- name: Write google-services.json - name: Write google-services.json
uses: DamianReeves/write-file-action@v1.2 uses: DamianReeves/write-file-action@v1.2
@@ -40,9 +43,7 @@ jobs:
# SY --> # SY -->
- name: Build app and run unit tests - name: Build app and run unit tests
uses: gradle/gradle-command-action@v2 run: ./gradlew assembleStandardRelease testStandardReleaseUnitTest --stacktrace
with:
arguments: assembleStandardRelease testStandardReleaseUnitTest --stacktrace
- name: Sign APK - name: Sign APK
uses: r0adkll/sign-android-release@v1 uses: r0adkll/sign-android-release@v1
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v1
- name: TAG - Bump version and push tag - name: TAG - Bump version and push tag
uses: anothrNick/github-tag-action@1.39.0 uses: anothrNick/github-tag-action@1.67.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true WITH_V: true
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Moderate issues - name: Moderate issues
uses: tachiyomiorg/issue-moderator-action@v2 uses: tachiyomiorg/issue-moderator-action@v2.6.0
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
duplicate-label: Duplicate duplicate-label: Duplicate
+2 -2
View File
@@ -26,8 +26,8 @@ android {
defaultConfig { defaultConfig {
applicationId = "eu.kanade.tachiyomi.sy" applicationId = "eu.kanade.tachiyomi.sy"
versionCode = 63 versionCode = 64
versionName = "1.10.3" versionName = "1.10.4"
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"") buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<changelog bulletedList="true"> <changelog bulletedList="true">
<changelogversion versionName="1.10.4" changeDate="Jan 17,2024">
<changelogtext>Hotfix for 1.10.3</changelogtext>
</changelogversion>
<changelogversion versionName="1.10.3" changeDate="Feb 17,2024"> <changelogversion versionName="1.10.3" changeDate="Feb 17,2024">
<changelogtext>[b]Based on Mihon stable 0.16.3(from 0.16.1)[/b]</changelogtext> <changelogtext>[b]Based on Mihon stable 0.16.3(from 0.16.1)[/b]</changelogtext>
<changelogtext>Use Mihon.app website</changelogtext> <changelogtext>Use Mihon.app website</changelogtext>
@@ -16,7 +16,12 @@ data class MangaCover(
val lastModified: Long, val lastModified: Long,
) { ) {
// SY --> // SY -->
val url: String = getCustomMangaInfo.get(mangaId)?.thumbnailUrl ?: ogUrl!! private val customThumbnailUrl = if (isMangaFavorite) {
getCustomMangaInfo.get(mangaId)?.thumbnailUrl
} else {
null
}
val url: String? = customThumbnailUrl ?: ogUrl
companion object { companion object {
private val getCustomMangaInfo: GetCustomMangaInfo by injectLazy() private val getCustomMangaInfo: GetCustomMangaInfo by injectLazy()