diff --git a/app/build.gradle b/app/build.gradle index 402becb2..abee3998 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.compose' id 'com.google.devtools.ksp' } @@ -62,9 +63,6 @@ android { buildFeatures { compose true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.14" - } namespace 'com.dessalines.thumbkey' } @@ -73,16 +71,16 @@ dependencies { implementation platform('androidx.compose:compose-bom:2024.05.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material:material-icons-extended-desktop' + implementation 'androidx.compose.material:material-icons-extended-desktop:1.6.7' implementation 'androidx.compose.material3:material3-window-size-class' implementation 'androidx.compose.ui:ui-tooling' - implementation 'androidx.compose.runtime:runtime-livedata' + implementation 'androidx.compose.runtime:runtime-livedata:1.6.7' // Activities implementation 'androidx.activity:activity-compose:1.9.0' // LiveData - implementation "androidx.lifecycle:lifecycle-runtime-compose" + implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.0' // Navigation implementation 'androidx.navigation:navigation-compose:2.7.7' diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/common/Dialogs.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/common/Dialogs.kt index d8c86a77..3983137b 100644 --- a/app/src/main/java/com/dessalines/thumbkey/ui/components/common/Dialogs.kt +++ b/app/src/main/java/com/dessalines/thumbkey/ui/components/common/Dialogs.kt @@ -37,6 +37,7 @@ val DONATION_MARKDOWN = - [Support on Liberapay](https://liberapay.com/dessalines). - [Support on Patreon](https://www.patreon.com/dessalines). --- + """.trimIndent() @OptIn(ExperimentalComposeUiApi::class) @@ -71,7 +72,6 @@ fun ShowChangelog(appSettingsViewModel: AppSettingsViewModel) { val markdownText = DONATION_MARKDOWN + markdown MarkdownText( markdown = markdownText, - color = MaterialTheme.colorScheme.onBackground, linkColor = MaterialTheme.colorScheme.primary, ) } diff --git a/build.gradle b/build.gradle index 4041aa8f..6da93d8b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,9 +9,10 @@ buildscript { plugins { id 'com.android.application' version '8.4.1' apply false id 'com.android.library' version '8.4.1' apply false - id 'org.jetbrains.kotlin.android' version '1.9.24' apply false + id 'org.jetbrains.kotlin.android' version '2.0.0' apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false id 'org.jmailen.kotlinter' version "4.3.0" apply false - id 'com.google.devtools.ksp' version "1.9.24-1.0.20" apply false + id 'com.google.devtools.ksp' version "2.0.0-1.0.21" apply false } subprojects {