From 6a5d210f077daf357af412f16c314cc5f972a3c7 Mon Sep 17 00:00:00 2001 From: firemaples Date: Sun, 18 May 2025 19:37:16 +0900 Subject: [PATCH 1/8] Update the target SDK to 35 --- main/build.gradle | 4 ++-- .../main/java/tw/firemaples/onscreenocr/utils/BitmapCache.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/build.gradle b/main/build.gradle index 62228632..7099c5f0 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -23,12 +23,12 @@ task ensureFiles { } android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "tw.firemaples.onscreenocr" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 124 versionName "4.0.6" diff --git a/main/src/main/java/tw/firemaples/onscreenocr/utils/BitmapCache.kt b/main/src/main/java/tw/firemaples/onscreenocr/utils/BitmapCache.kt index 7f8d949a..2ee33a5b 100644 --- a/main/src/main/java/tw/firemaples/onscreenocr/utils/BitmapCache.kt +++ b/main/src/main/java/tw/firemaples/onscreenocr/utils/BitmapCache.kt @@ -83,7 +83,7 @@ object BitmapCache { return false } - val targetConfig = config ?: this.config + val targetConfig = config ?: this.config ?: return false val byteCount = width * height * targetConfig.getBytesPerPixel() return byteCount <= this.allocationByteCount } From 13866e948f5dd4434964e4bad1e7cb73abc6a7ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 10:40:54 +0000 Subject: [PATCH 2/8] Update dependency androidx.core:core-ktx to v1.16.0 --- main/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/build.gradle b/main/build.gradle index 7099c5f0..2377b83b 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -111,7 +111,7 @@ dependencies { implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' From 73d417e5a7e205f934e708c7ee1a13d735bf102b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 10:40:59 +0000 Subject: [PATCH 3/8] Update dependency androidx.work:work-runtime-ktx to v2.10.1 --- main/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/build.gradle b/main/build.gradle index 7099c5f0..c5cd8f78 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -145,7 +145,7 @@ dependencies { androidTestImplementation "androidx.navigation:navigation-testing:$nav_version" // required to avoid crash on Android 12 API 31 - implementation 'androidx.work:work-runtime-ktx:2.8.1' + implementation 'androidx.work:work-runtime-ktx:2.10.1' // Compose def composeBom = platform('androidx.compose:compose-bom:2024.12.01') From d526a2d064c5b3719224411b99186f8a3feb463b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 10:41:09 +0000 Subject: [PATCH 4/8] Update lifecycle_version to v2.9.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37c36224..77b0a3d2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.nav_version = "2.6.0" // require SDK 34 from 2.7.0 ext.hilt_version = "2.56.2" ext.coroutines_version = "1.10.2" - ext.lifecycle_version = "2.6.2" + ext.lifecycle_version = "2.9.0" ext.text_recognition_version = "16.0.1" ext.kotpref_version = "2.13.2" ext.retrofit2_version = "3.0.0" From bcc631f225b7d0ea52034663cd87e9b48ef332bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 10:41:14 +0000 Subject: [PATCH 5/8] Update nav_version to v2.9.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37c36224..3d2243f3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.nav_version = "2.6.0" // require SDK 34 from 2.7.0 + ext.nav_version = "2.9.0" // require SDK 34 from 2.7.0 ext.hilt_version = "2.56.2" ext.coroutines_version = "1.10.2" ext.lifecycle_version = "2.6.2" From f1b284318af26e16b574c076b0bc10bf1969fbaa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 May 2025 10:41:19 +0000 Subject: [PATCH 6/8] Update dependency androidx.compose:compose-bom to v2025 --- main/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/build.gradle b/main/build.gradle index 7099c5f0..e722ccf4 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -148,7 +148,7 @@ dependencies { implementation 'androidx.work:work-runtime-ktx:2.8.1' // Compose - def composeBom = platform('androidx.compose:compose-bom:2024.12.01') + def composeBom = platform('androidx.compose:compose-bom:2025.05.00') implementation composeBom androidTestImplementation composeBom // Material Design 3 From b4eebce4d950c9e628df90525be78cce71d6429e Mon Sep 17 00:00:00 2001 From: firemaples Date: Sun, 18 May 2025 19:45:39 +0900 Subject: [PATCH 7/8] Remove unused rules after upgrading target SDK to 35 --- main/proguard-rules.pro | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main/proguard-rules.pro b/main/proguard-rules.pro index d220f7b1..0ada610a 100644 --- a/main/proguard-rules.pro +++ b/main/proguard-rules.pro @@ -74,8 +74,3 @@ -if interface * { @retrofit2.http.* public *** *(...); } -keep,allowoptimization,allowshrinking,allowobfuscation class <3> ##### Proguard2 End - -##### Proguard R8 --dontwarn android.media.LoudnessCodecController$OnLoudnessCodecUpdateListener --dontwarn android.media.LoudnessCodecController -##### From 8faffa7afaaae217263a42c72de04f7c1801f628 Mon Sep 17 00:00:00 2001 From: firemaples Date: Sun, 18 May 2025 20:07:19 +0900 Subject: [PATCH 8/8] Bump com.google.android.gms:play-services-ads to 23.6.0 --- main/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/build.gradle b/main/build.gradle index 0d3e14fb..ad2ea37c 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -239,7 +239,7 @@ dependencies { // implementation 'com.mopub.mediation:adcolony:4.5.0.1' // Admob - implementation 'com.google.android.gms:play-services-ads:22.6.0' + implementation 'com.google.android.gms:play-services-ads:23.6.0' // Facebook Ad network implementation 'com.google.ads.mediation:facebook:6.19.0.0' // Adcolony Ad network