Upgrading to 2.0.0 compiler. (#922)

This commit is contained in:
Dessalines 2024-05-22 13:38:20 -04:00 committed by GitHub
parent 042bb7f794
commit 1c7c47460e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 9 deletions

View File

@ -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'

View File

@ -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,
)
}

View File

@ -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 {