Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Gradle 8.11.1
  • Loading branch information
jeffdgr8 committed Dec 11, 2024
1 parent 731b010 commit 7acfabf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/base-convention.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
Expand All @@ -24,7 +23,6 @@ kotlin {
osx.deploymentTarget = "10.14"
}

@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")

sourceSets.configureEach {
Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/libcblite.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.KonanTarget

fun KotlinMultiplatformExtension.linkLibcblite(delegate: DelegatingProjectDependency) =
linkLibcblite(delegate.dependencyProject)
linkLibcblite(project.project(delegate.path))

// TODO: use context receiver to provide ProjectDelegate receiver to access project
@Suppress("INVISIBLE_MEMBER")
fun KotlinMultiplatformExtension.linkLibcblite(fromProject: Project = project) {
with(project) {
targets.withType<KotlinNativeTarget>().configureEach {
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ kotlinx-serialization = "1.7.3"
mockk = "1.13.13"

[plugins]
android-library = { id = "com.android.library", version = "8.2.2" }
android-library = { id = "com.android.library", version = "8.7.3" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "2.1.0" }
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }

[libraries]
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.8.6" }
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.8.7" }
androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.2.0" }
androidx-test-core-ktx = { module = "androidx.test:core-ktx", version = "1.6.1" }
androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
Expand All @@ -23,14 +23,14 @@ couchbase-lite-android-ee = { module = "com.couchbase.lite:couchbase-lite-androi
couchbase-lite-java = { module = "com.couchbase.lite:couchbase-lite-java", version.ref = "couchbase-lite-java" }
couchbase-lite-java-ee = { module = "com.couchbase.lite:couchbase-lite-java-ee", version.ref = "couchbase-lite-java" }
dokka-versioning = { module = "org.jetbrains.dokka:versioning-plugin", version.ref = "dokka" }
kermit = { module = "co.touchlab:kermit", version = "2.0.4" }
kermit = { module = "co.touchlab:kermit", version = "2.0.5" }
korlibs-korio = { module = "com.soywiz.korlibs.korio:korio", version = "4.0.10" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.26.0" }
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.26.1" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.9.0" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.1" }
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.5.4" }
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.6.0" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 7acfabf

Please sign in to comment.