diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b3006b..02c4aa5 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,14 +6,12 @@ - diff --git a/app/src/main/java/de/pawcode/cardstore/ui/CardStore.kt b/app/src/main/java/de/pawcode/cardstore/ui/CardStore.kt index 04037bb..eb79f6d 100644 --- a/app/src/main/java/de/pawcode/cardstore/ui/CardStore.kt +++ b/app/src/main/java/de/pawcode/cardstore/ui/CardStore.kt @@ -88,7 +88,7 @@ fun CardStore(modifier: Modifier = Modifier) { NavDisplay( entries = navigationState.toEntries(entryProvider), onBack = { navigator.goBack() }, - sceneStrategy = remember { DialogSceneStrategy() }, + sceneStrategies = remember { listOf(DialogSceneStrategy()) }, transitionSpec = { slideInHorizontally(initialOffsetX = { it }) togetherWith ExitTransition.None }, diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..5c34300 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/04e088f8677de3b384108493cc9481d0/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e55dccbfe27cb97945148c61a39c89c5/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect +toolchainVendor=JETBRAINS +toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 213bbd4..9d985a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,10 +14,10 @@ junit = "4.13.2" junitVersion = "1.3.0" kotlin = "2.3.20" kotlinSerialization = "2.3.20" -kotlinxSerialization = "1.10.0" +kotlinxSerialization = "1.11.0" lifecycleRuntimeKtx = "2.10.0" lifecycleViewmodelNav3 = "2.10.0" -nav3Core = "1.0.1" +nav3Core = "1.1.0" playServicesCodeScanner = "16.1.0" revealswipe = "3.0.0" review = "2.0.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index 2e1afc0..ade1b89 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,6 +11,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {