Update dependencies

Fate-Grand-Automata · Nov 27, 2024 · 7c1ee7a · 7c1ee7a
1 parent e32930c
commit 7c1ee7a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
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,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
@@ -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
@@ -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")