Skip to content

Commit

Permalink
Merge branch 'main' into spotless-ktlint
Browse files Browse the repository at this point in the history
  • Loading branch information
geoff-powell authored Dec 18, 2023
2 parents 3be0e2e + 2d7678a commit 3ee7805
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 1 addition & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ plugins {
}

allprojects {
afterEvaluate {
extensions.findByType<ComposeExtension>()?.apply {
kotlinCompilerPlugin.set(libs.versions.compose.kotlin.compiler.get())
}

extensions.findByType<com.diffplug.gradle.spotless.SpotlessExtension>()?.apply { // if you are using build.gradle.kts, instead of 'spotless {' use:
kotlin {
// by default the target is every '.kt' and '.kts` file in the java sourcesets
Expand All @@ -41,4 +36,4 @@ allprojects {
}
}
}
}
}
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.0"
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 3ee7805

Please sign in to comment.