Skip to content

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
- Update Kotlin to 2.0.21
- Update kotlinx-serialization-json to 1.7.3
- Update kord-gradle-plugin to 1.7.1
- Update com.vanniktech.maven.publish.base to 0.30.0
- Update Dokka to 2.0.0-Beta
- Add linuxArm64 target
  • Loading branch information
DRSchlaubi committed Oct 21, 2024
1 parent b926058 commit 5040050
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 25 deletions.
40 changes: 21 additions & 19 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.gradle.kotlin.dsl.kord
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

group = Library.group

Expand All @@ -17,15 +18,26 @@ repositories {
maven("https://oss.sonatype.org/content/repositories/snapshots")
}

kord {
publicationName = "mavenCentral"
metadataHost = Family.OSX
jvmTarget = JvmTarget.JVM_1_8
}

dependencies {
commonMainImplementation(libs.kord.core)
commonTestImplementation(kotlin("test"))
}

kotlin {
explicitApi()
jvm()
js(IR) {
nodejs()
}
jvmToolchain(8)

linuxX64()
linuxArm64()

mingwX64()

Expand Down Expand Up @@ -55,17 +67,17 @@ tasks {
withType<KotlinNativeSimulatorTest> {
enabled = false
}
}

withType<AbstractDokkaLeafTask> {
dokkaSourceSets.configureEach {
dokka {
dokkaSourceSets.configureEach {
sourceLink {
localDirectory = project.file("src/main/kotlin")
remoteUrl = project.uri("https://github.com/kordlib/kordx.emoji/tree/feature/mpp/src/$name/kotlin/").toURL()
localDirectory = project.file("src/main/kotlin")
remoteUrl = project.uri("https://github.com/kordlib/kordx.emoji/tree/feature/mpp/src/$name/kotlin/")

remoteLineSuffix = "#L"
}
remoteLineSuffix = "#L"
}
}
}
}

mavenPublishing {
Expand Down Expand Up @@ -107,13 +119,3 @@ mavenPublishing {
}
}
}

kord {
publicationName = "mavenCentral"
metadataHost = Family.OSX
}

dependencies {
commonMainImplementation(libs.kord.core)
commonTestImplementation(kotlin("test"))
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
kotlin.native.ignoreDisabledTargets=true
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
nextPlannedVersion=0.7.0
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]
kotlin = "2.0.20"
kotlin = "2.0.21"

[libraries]
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.2" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.18.1" }
kord-core = { group = "dev.kord", name = "kord-core", version = "feature-native-SNAPSHOT" }
codegen-kotlinpoet = { group = "dev.kord.codegen", name = "kotlinpoet", version = "main-SNAPSHOT" }

[plugins]
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kord-gradle-plugin = { id = "dev.kord.gradle-tools", version = "1.6.3" }
maven-publish-plugin = { id = "com.vanniktech.maven.publish.base", version = "0.29.0" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
kord-gradle-plugin = { id = "dev.kord.gradle-tools", version = "1.7.1" }
maven-publish-plugin = { id = "com.vanniktech.maven.publish.base", version = "0.30.0" }
dokka = { id = "org.jetbrains.dokka", version = "2.0.0-Beta" }
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.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 5040050

Please sign in to comment.