Skip to content

Commit

Permalink
Merge branch 'renovate/sqldelight' of github.com:geoff-powell/tidy in…
Browse files Browse the repository at this point in the history
…to renovate/sqldelight

* 'renovate/sqldelight' of github.com:geoff-powell/tidy:
  Update sqldelight to v2.0.1
  Compose multiplatform (#43)

# Conflicts:
#	gradle/libs.versions.toml
  • Loading branch information
geoff-powell committed Dec 18, 2023
2 parents d32a7f1 + e737ed8 commit 28c7ed8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
8 changes: 0 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@ plugins {
alias(libs.plugins.ksp) apply false
alias(libs.plugins.sqldelight) apply false
}

allprojects {
afterEvaluate {
extensions.findByType<ComposeExtension>()?.apply {
kotlinCompilerPlugin.set(libs.versions.compose.kotlin.compiler.get())
}
}
}
7 changes: 3 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[versions]
kotlin = "2.0.0-Beta1"
agp = "8.2.0"
compose = "1.5.11"
androidx-compose = "1.5.4"
ktor = "3.2.0"
compose = "1.6.0-alpha01"
ktor = "2.3.7"
koin = "3.5.0"
voyager = "1.0.0"
sqldelight = "2.0.1"
compose-kotlin-compiler = "1.5.4-dev1-kt2.0.0-Beta1"
androidx-compose = "1.5.4"
android-compileSdk = "34"
android-targetSdk = "34"
android-minSdk = "24"
Expand Down

0 comments on commit 28c7ed8

Please sign in to comment.