Skip to content

Commit

Permalink
update deps, relax requirements on versions and gradle flags
Browse files Browse the repository at this point in the history
  • Loading branch information
Nek-12 committed Jun 20, 2024
1 parent 38f07eb commit b5e3757
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ConfigurePublication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fun Project.publishMultiplatform() {
*/
fun Project.publishAndroid(ext: LibraryExtension) = with(ext) {
val properties = localProperties()
val isReleaseBuild = requireNotNull(properties["release"]).toString().toBooleanStrict()
val isReleaseBuild = properties["release"].toString().toBoolean()
publishing {
singleVariant(Config.publishingVariant) {
withSourcesJar()
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
activity = "1.9.0"
compose = "1.6.10"
compose = "1.6.11"
lifecycle = "2.8.0"
composeDetektPlugin = "1.3.0"
core-ktx = "1.13.1"
Expand All @@ -10,20 +10,20 @@ dependencyAnalysisPlugin = "1.32.0"
detekt = "1.23.6"
detektFormattingPlugin = "1.23.6"
dokka = "1.9.20"
essenty = "2.0.0"
fragment = "1.8.0-rc01"
gradleAndroid = "8.6.0-alpha03"
essenty = "2.1.0"
fragment = "1.8.0"
gradleAndroid = "8.5.0"
gradleDoctorPlugin = "0.10.0"
intellij-ide-plugin = "2.0.0-beta1"
junit = "4.13.2"
kotest = "5.9.0"
kotest = "5.9.1"
# @pin
kotlin = "2.0.0"
kotlin-collections = "0.3.7"
kotlin-io = "0.3.5"
kotlin-io = "0.4.0"
kotlinx-atomicfu = "0.24.0"
ktor = "3.0.0-beta-1"
serialization = "1.7.0-RC"
serialization = "1.7.0"
turbine = "1.1.0"
uuid = "0.8.4"
versionCatalogUpdatePlugin = "0.8.4"
Expand Down
6 changes: 0 additions & 6 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import org.intellij.lang.annotations.Language
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenExec
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
Expand Down Expand Up @@ -31,11 +30,6 @@ val generateBuildConfig by tasks.registering(Sync::class) {
into(layout.buildDirectory.dir("generated/kotlin/src/commonMain"))
}

// // https://youtrack.jetbrains.com/issue/KT-68088
tasks.withType<BinaryenExec>().configureEach {
enabled = false
}

kotlin {
applyDefaultHierarchyTemplate()

Expand Down
7 changes: 3 additions & 4 deletions sample/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
decompose = "3.0.0"
apiresult = "1.0.4"
decompose = "3.1.0"
apiresult = "2.0.0-alpha01"
koin = "3.6.0-wasm-alpha2"
kmputils = "1.3.2"
kmputils = "1.4.1"
material = "1.12.0"
activity = "1.9.0"
okio = "3.9.0"
Expand All @@ -23,7 +23,6 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
koin-android-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin" }
koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
okio-fakefsys = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "okio" }
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
apiresult = { module = "pro.respawn.apiresult:core", version.ref = "apiresult" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "activity" }
Expand Down

0 comments on commit b5e3757

Please sign in to comment.