Merge branch 'master' into cs-refill

Fate-Grand-Automata · Nov 28, 2024 · 4b63eeb · 4b63eeb
2 parents dd36692 + 1e852cb
commit 4b63eeb
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 61 deletions.
diff --git 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 }}
+          path: ${{ env.FGA_MAPPING_PATH }}
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git 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)

diff --git 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
@@ -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
@@ -211,7 +211,7 @@ fun <T> 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
@@ -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
@@ -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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,44 +1,44 @@
 [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"
 
 
-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.5.2"
+gradle_version = "8.7.2"
 
 
 ben-manes_versions = "0.51.0"
 accompanist_version = "0.36.0"
 
 google_android_play_version = "2.1.0"
 
-activity_version = "1.9.2"
-mockk_version = "1.13.12"
+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"
 
 timber_version = "5.0.1"
 
-compose_bom_version = "2024.09.02"
+compose_bom_version = "2024.11.00"
 
 
 coil_version = "3.0.3"
-junit_bom_version = "5.11.0"
+junit_bom_version = "5.11.3"
 
 
 [libraries]

diff --git 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

diff --git 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/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/"
+      ]
     }
   ]
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-    id("com.gradle.enterprise") version("3.17.6")
+    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")