From 25446a5105eb00ff211ea8962467d2dc8bc93e54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:30:00 +0000 Subject: [PATCH 01/12] Update activity.version to v1.9.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c421ff1f9..a4a753d9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ accompanist_version = "0.36.0" google_android_play_version = "2.1.0" -activity_version = "1.9.2" +activity_version = "1.9.3" mockk_version = "1.13.12" opencv_version = "4.10.0" From 5b77bb2558deb97c851bf3b533be7c38409f590a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:30:20 +0000 Subject: [PATCH 02/12] Update plugin com.gradle.enterprise to v3.18.2 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index acae5cbcd..142b2df39 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.gradle.enterprise") version("3.17.6") + id("com.gradle.enterprise") version("3.18.2") } gradleEnterprise { buildScan { From 100f233d090c352b7dac4ec0e9f6df55bff1cafa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:24:06 +0000 Subject: [PATCH 03/12] Update dependency fastlane to v2.225.0 --- Gemfile.lock | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 443c2d3e4..ec4b80e05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,20 +10,20 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.1012.0) + aws-sdk-core (3.213.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.157.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.173.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -38,8 +38,8 @@ GEM domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.111.0) - faraday (1.10.3) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -65,10 +65,10 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.222.0) + fastlane (2.225.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -84,6 +84,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -109,6 +110,8 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -147,21 +150,21 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.7.2) - jwt (2.8.2) + json (2.8.2) + jwt (2.9.3) base64 mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) - nanaimo (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.5.0) + optparse (0.6.0) os (1.1.4) plist (3.7.1) public_suffix (5.1.1) @@ -184,6 +187,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -193,15 +197,15 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.25.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) From 9281a52088760ff55f356f28a4b6471912cf37bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:29:10 +0000 Subject: [PATCH 04/12] Update dependency gradle to v8.11.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..e2847c820 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From b3cb3d470e71bc32aa66a394eb424f8076914a8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:30:13 +0000 Subject: [PATCH 05/12] Update dependency com.android.tools.build:gradle to v8.7.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4a753d9a..900b3a74e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ gson_version = "2.11.0" kotlin_version = "2.0.20" ksp_version = "2.0.20-1.0.25" -gradle_version = "8.5.2" +gradle_version = "8.7.2" ben-manes_versions = "0.51.0" From 07511acd97f02f4510cfbf4f19af12c2afa8ddec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:30:07 +0000 Subject: [PATCH 06/12] Update dependency org.junit:junit-bom to v5.11.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 900b3a74e..7d3a6d382 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ compose_bom_version = "2024.09.02" coil_version = "3.0.3" -junit_bom_version = "5.11.0" +junit_bom_version = "5.11.3" [libraries] From 2dc74549ffab582c8e9de6ebc0bad6871ca60b77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:22:07 +0000 Subject: [PATCH 07/12] Update kotlin --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d3a6d382..6ed02274b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,8 +12,8 @@ hilt_version = "2.52" gson_version = "2.11.0" -kotlin_version = "2.0.20" -ksp_version = "2.0.20-1.0.25" +kotlin_version = "2.0.21" +ksp_version = "2.0.21-1.0.28" gradle_version = "8.7.2" From 523f02a4d885b91f754dd3bae2d8c8f2107f4d57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:02:12 +0000 Subject: [PATCH 08/12] Migrate config renovate.json --- renovate.json | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/renovate.json b/renovate.json index 7a0a3ec9f..6c2e03023 100644 --- a/renovate.json +++ b/renovate.json @@ -1,11 +1,15 @@ { "extends": [ - "config:base" + "config:recommended" + ], + "ignorePresets": [ + ":prHourlyLimit2" ], - "ignorePresets": [":prHourlyLimit2"], "timezone": "Europe/Berlin", "gradle": { - "extends": ["schedule:monthly"], + "extends": [ + "schedule:monthly" + ], "enabled": true }, "github-actions": { @@ -15,12 +19,12 @@ }, "packageRules": [ { - "matchPackagePatterns": [ - "^org.jetbrains.kotlin", - "^com.google.devtools.ksp", - "^androidx.compose.compiler" - ], - "groupName": "kotlin" + "groupName": "kotlin", + "matchPackageNames": [ + "/^org.jetbrains.kotlin/", + "/^com.google.devtools.ksp/", + "/^androidx.compose.compiler/" + ] } ] } From f056e6d5b17944de6f5c8171cba19a05937ae8e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:23:30 +0000 Subject: [PATCH 09/12] Update dependency io.mockk:mockk to v1.13.13 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ed02274b..2dd04723d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ accompanist_version = "0.36.0" google_android_play_version = "2.1.0" activity_version = "1.9.3" -mockk_version = "1.13.12" +mockk_version = "1.13.13" opencv_version = "4.10.0" navigation_compose_version = "2.8.1" From e32930cc00dce7579f036f787ba5004347441449 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:30:03 +0000 Subject: [PATCH 10/12] Update dependency androidx.navigation:navigation-compose to v2.8.4 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2dd04723d..3610d12e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ activity_version = "1.9.3" mockk_version = "1.13.13" opencv_version = "4.10.0" -navigation_compose_version = "2.8.1" +navigation_compose_version = "2.8.4" recyclerview_version = "1.3.2" tesseract4android_version = "4.7.0" From 7c1ee7a9737cb154d651ea09f4dbf94e270e6ed7 Mon Sep 17 00:00:00 2001 From: reconman Date: Wed, 27 Nov 2024 21:01:22 +0100 Subject: [PATCH 11/12] Update dependencies --- .idea/kotlinc.xml | 2 +- app/build.gradle.kts | 10 +++++----- .../io/github/fate_grand_automata/ui/OnLifecycle.kt | 2 +- .../github/fate_grand_automata/ui/dialog/FgaDialog.kt | 2 +- .../ui/onboarding/OnboardingItems.kt | 3 ++- gradle.properties | 1 - gradle/libs.versions.toml | 8 ++++---- prefs/build.gradle.kts | 2 +- settings.gradle.kts | 8 ++++---- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index d4b7accba..c224ad564 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 568c22a12..fe4bbf3a9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag + plugins { id("com.android.application") id("kotlin-android") @@ -8,7 +10,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 ndkVersion = "21.3.6528147" compileOptions { @@ -18,6 +20,7 @@ android { buildFeatures { compose = true + buildConfig = true } kotlinOptions { @@ -29,9 +32,6 @@ android { freeCompilerArgs += "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi" freeCompilerArgs += "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi" } - composeCompiler { - enableStrongSkippingMode = true - } androidResources { generateLocaleConfig = true @@ -40,7 +40,7 @@ android { defaultConfig { applicationId = "io.github.fate_grand_automata" minSdk = 24 - targetSdk = 34 + targetSdk = 35 versionCode = System.getenv("FGA_VERSION_CODE")?.toInt() ?: 1 versionName = System.getenv("FGA_VERSION_NAME") ?: System.getenv("FGA_VERSION_CODE") ?: "0.1.0" } diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/OnLifecycle.kt b/app/src/main/java/io/github/fate_grand_automata/ui/OnLifecycle.kt index 1aa556dc5..188eec9a5 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/OnLifecycle.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/OnLifecycle.kt @@ -4,9 +4,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver +import androidx.lifecycle.compose.LocalLifecycleOwner @Composable private fun OnLifecycle(predicate: (Lifecycle.Event) -> Boolean, callback: () -> Unit) { diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/dialog/FgaDialog.kt b/app/src/main/java/io/github/fate_grand_automata/ui/dialog/FgaDialog.kt index c608b22e7..028678acc 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/dialog/FgaDialog.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/dialog/FgaDialog.kt @@ -211,7 +211,7 @@ fun FgaDialog.multiChoiceList( ChoiceListItem( isSelected = it in selected, onClick = { onSelectedChange(selected.toggle(it)) }, - modifier = Modifier.animateItemPlacement( + modifier = Modifier.animateItem( spring( stiffness = Spring.StiffnessMedium ) diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/onboarding/OnboardingItems.kt b/app/src/main/java/io/github/fate_grand_automata/ui/onboarding/OnboardingItems.kt index 151c7d859..0903616ee 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/onboarding/OnboardingItems.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/onboarding/OnboardingItems.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextField @@ -102,7 +103,7 @@ fun LocaleDropdownMenu() { expanded = expanded ) }, - modifier = Modifier.menuAnchor() + modifier = Modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable) ) ExposedDropdownMenu( expanded = expanded, diff --git a/gradle.properties b/gradle.properties index 163a07c11..c3e5a7030 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,6 +19,5 @@ android.useAndroidX=true android.enableJetifier=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=true android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3610d12e1..6cc554323 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] appcompat_version = "1.7.0" assertk_version = "0.28.1" -constraintlayout_version = "2.1.4" -core_ktx_version = "1.13.1" +constraintlayout_version = "2.2.0" +core_ktx_version = "1.15.0" documentfile_version = "1.0.1" flow_preferences_version = "1.9.1" hilt_navigation_compose_version = "1.2.0" kotlinx_coroutines_core_version = "1.9.0" -lifecycle_version = "2.8.6" +lifecycle_version = "2.8.7" hilt_version = "2.52" gson_version = "2.11.0" @@ -34,7 +34,7 @@ tesseract4android_version = "4.7.0" timber_version = "5.0.1" -compose_bom_version = "2024.09.02" +compose_bom_version = "2024.11.00" coil_version = "3.0.3" diff --git a/prefs/build.gradle.kts b/prefs/build.gradle.kts index 29b1224c1..291669847 100644 --- a/prefs/build.gradle.kts +++ b/prefs/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/settings.gradle.kts b/settings.gradle.kts index 142b2df39..612d355e2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,10 @@ plugins { - id("com.gradle.enterprise") version("3.18.2") + id("com.gradle.develocity") version("3.18.2") } -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } include(":prefs") From 1e852cb8534e0ee25499f8dd75bcd7a7771c151c Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Thu, 28 Nov 2024 04:11:28 +0800 Subject: [PATCH 12/12] Fix PR Build artifact name (#1924) --- .github/workflows/pr-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index b40b0219f..b13e8fc83 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -59,8 +59,8 @@ jobs: echo "FGA_APK_PATH=app/build/outputs/apk/ci/fga-pr-$build_name.apk" >>${GITHUB_ENV} echo "FGA_MAPPING_PATH=app/build/outputs/apk/ci/fga-mapping-$build_name.txt" >>${GITHUB_ENV} - echo "FGA_APK_ARTIFACT_NAME=FGA-PR-apk-$build_name" >>${GITHUB_ENV} - echo "FGA_MAPPING_ARTIFACT_NAME=FGA-PR-mapping-$build_name" >>${GITHUB_ENV} + echo "FGA_APK_ARTIFACT_NAME=FGA-apk-PR-$build_name" >>${GITHUB_ENV} + echo "FGA_MAPPING_ARTIFACT_NAME=FGA-mapping-PR-$build_name" >>${GITHUB_ENV} - name: Upload APK uses: actions/upload-artifact@v4 @@ -72,4 +72,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ env.FGA_MAPPING_ARTIFACT_NAME }} - path: ${{ env.FGA_MAPPING_PATH }} \ No newline at end of file + path: ${{ env.FGA_MAPPING_PATH }}