From 8e154956382510ff7a016b635876571ef1d51557 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sun, 14 May 2023 22:45:38 +0800 Subject: [PATCH 1/8] build: enable R8 minify & include important JVM arguments try to fix workflow error. The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled. --- app/build.gradle | 4 ++-- gradle.properties | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 57b96c2de..2dd13c9ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,8 +71,8 @@ android { } applicationIdSuffix '.release' - minifyEnabled false - //shrinkResources true + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } debug { diff --git a/gradle.properties b/gradle.properties index f0c939d85..70d2795c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,9 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx6000m +# Default value: -Xmx512m -XX:MaxMetaspaceSize=384m +# Bugs: This will override important JVM argument defaults. Include all important JVM arguments if you wan to change arguments. See https://github.com/gradle/gradle/issues/19750 +org.gradle.jvmargs=-Xmx6000m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 135b0c3765c28f2a4f383c910ecc7614ac6befa7 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sun, 14 May 2023 23:02:15 +0800 Subject: [PATCH 2/8] build: Enable parallel GC --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 70d2795c4..49cc9eecf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,9 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx512m -XX:MaxMetaspaceSize=384m +# Default value: -Xmx512m -Xms256m -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError # Bugs: This will override important JVM argument defaults. Include all important JVM arguments if you wan to change arguments. See https://github.com/gradle/gradle/issues/19750 -org.gradle.jvmargs=-Xmx6000m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-XX:+UseParallelGC -Xmx6g -Xms256m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 2e25aeff9bd241a05e4170a7add61267b4a449f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 05:07:00 +0000 Subject: [PATCH 3/8] Bump coroutines_version from 1.7.0 to 1.7.1 Bumps `coroutines_version` from 1.7.0 to 1.7.1. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.0...1.7.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2dd13c9ec..90fdaaf7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,7 +149,7 @@ dependencies { //noinspection GradleDependency,DifferentStdlibGradleVersion implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version") //协程 - def coroutines_version = '1.7.0' + def coroutines_version = '1.7.1' implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version") From aa4238667f8a0abaec138e51293f4320ec20e627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 05:07:07 +0000 Subject: [PATCH 4/8] Bump androidx.core:core-ktx from 1.10.0 to 1.10.1 Bumps androidx.core:core-ktx from 1.10.0 to 1.10.1. --- updated-dependencies: - dependency-name: androidx.core:core-ktx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2dd13c9ec..e3cc66490 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,7 +157,7 @@ dependencies { implementation('com.github.android:renderscript-intrinsics-replacement-toolkit:b6363490c3') //androidX - implementation('androidx.core:core-ktx:1.10.0') + implementation('androidx.core:core-ktx:1.10.1') implementation('androidx.appcompat:appcompat:1.6.1') implementation('androidx.activity:activity-ktx:1.7.1') implementation('androidx.fragment:fragment-ktx:1.5.7') From 21a526650756480763821cda2c9e432cce52c6fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 05:07:22 +0000 Subject: [PATCH 5/8] Bump com.google.protobuf:protobuf-javalite from 3.22.4 to 3.23.0 Bumps com.google.protobuf:protobuf-javalite from 3.22.4 to 3.23.0. --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-javalite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2dd13c9ec..a09147963 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -217,7 +217,7 @@ dependencies { //网络 implementation('com.squareup.okhttp3:okhttp:4.11.0') appImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) - appImplementation 'com.google.protobuf:protobuf-javalite:3.22.4' + appImplementation 'com.google.protobuf:protobuf-javalite:3.23.0' //Glide def glideVersion = "4.15.1" From 82be8b2ceb4eb13698abff5883b0a2f16226df61 Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 15 May 2023 20:41:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3a0ebba43..5fb17dfb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -186,9 +186,6 @@ dependencies { // For exposing and controlling media sessions //implementation "androidx.media3:media3-session:$media3_version" -// implementation("com.google.android.exoplayer:exoplayer-core:$exoplayer_version") -// implementation("com.google.android.exoplayer:extension-okhttp:$exoplayer_version") - //Splitties implementation("com.louiscad.splitties:splitties-appctx:$splitties_version") implementation("com.louiscad.splitties:splitties-systemservices:$splitties_version") From 405a3ab9d0fcae66ee00479054c8e5fe9a86c3b2 Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 15 May 2023 21:13:28 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/help/exoplayer/ExoPlayerHelper.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt b/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt index 95955c789..e693c583d 100644 --- a/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt +++ b/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt @@ -20,9 +20,9 @@ import androidx.media3.exoplayer.offline.DefaultDownloaderFactory import androidx.media3.exoplayer.offline.DownloadRequest import androidx.media3.exoplayer.offline.DownloaderFactory import androidx.media3.exoplayer.source.DefaultMediaSourceFactory -import com.google.gson.GsonBuilder import com.google.gson.reflect.TypeToken import io.legado.app.help.http.okHttpClient +import io.legado.app.utils.GSON import okhttp3.CacheControl import splitties.init.appCtx import java.io.File @@ -30,21 +30,19 @@ import java.lang.reflect.Type import java.util.concurrent.TimeUnit +@Suppress("unused") @SuppressLint("UnsafeOptInUsageError") object ExoPlayerHelper { private const val SPLIT_TAG = "\uD83D\uDEA7" - private val gson by lazy { - GsonBuilder().create() - } private val mapType by lazy { val type: Type = object : TypeToken?>() {}.type type } fun createMediaItem(url: String, headers: Map): MediaItem { - val formatUrl = url + SPLIT_TAG + gson.toJson(headers, mapType) + val formatUrl = url + SPLIT_TAG + GSON.toJson(headers, mapType) return MediaItem.Builder().setUri(formatUrl).build() } @@ -103,7 +101,7 @@ object ExoPlayerHelper { val url = urls[0] res = res.withUri(Uri.parse(url)) try { - val headers: Map = gson.fromJson(urls[1], mapType) + val headers: Map = GSON.fromJson(urls[1], mapType) res = res.withAdditionalHeaders(headers) } catch (_: Exception) { } From 6f2db4e834a2f45effccdf332af4fff7718ff98c Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 15 May 2023 23:27:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/service/BaseReadAloudService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt index 92f2b6184..425577d5d 100644 --- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt @@ -311,7 +311,7 @@ abstract class BaseReadAloudService : BaseService(), } /** - * 断开耳机监听 + * 注册多媒体按钮监听 */ private fun initBroadcastReceiver() { val intentFilter = IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)