Skip to content
This repository has been archived by the owner on Feb 1, 2025. It is now read-only.

Commit

Permalink
Updating dependencies
Browse files Browse the repository at this point in the history
Kotlin to 1.9.23
Tried 1.8.x but had compilation issues which were seemingly resolved in 1.9.23

Kotest to 5.8.1

Gradle to 8.6
  • Loading branch information
Kantis committed Mar 18, 2024
1 parent 90b5952 commit 4d51c81
Show file tree
Hide file tree
Showing 6 changed files with 2,020 additions and 56 deletions.
47 changes: 12 additions & 35 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
buildscript {
repositories {
mavenCentral()
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
}
maven {
url = uri("https://plugins.gradle.org/m2/")
}
}
}

plugins {
java
`java-library`
signing
`maven-publish`
id("org.jetbrains.dokka") version Libs.dokkaVersion
kotlin("multiplatform").version(Libs.kotlinVersion)
}

Expand All @@ -31,47 +17,38 @@ group = Libs.org
version = Ci.version

kotlin {

targets {

jvm {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
jvm {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

js {
browser()
nodejs()
}
js(IR) {
browser()
nodejs()
}

sourceSets {

val commonMain by getting {
dependencies {
api(Libs.Kotest.property)
implementation(Libs.Kotlinx.kotlintime)
}
}

val jvmMain by getting {
dependsOn(commonMain)
}

val jvmTest by getting {
dependsOn(jvmMain)
dependencies {
implementation(Libs.Kotest.junit5)

}
}

all {
languageSettings.useExperimentalAnnotation("kotlin.time.ExperimentalTime")
languageSettings.useExperimentalAnnotation("kotlin.experimental.ExperimentalTypeInference")
languageSettings.apply {
optIn("kotlin.time.ExperimentalTime")
optIn("kotlin.experimental.ExperimentalTypeInference")
}
}
}
}
Expand Down
10 changes: 4 additions & 6 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import org.gradle.kotlin.dsl.`kotlin-dsl`

repositories {
jcenter()
}

plugins {
`kotlin-dsl`
}

repositories {
mavenCentral()
}
7 changes: 3 additions & 4 deletions buildSrc/src/main/kotlin/Libs.kt
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
object Libs {

const val kotlinVersion = "1.6.21"
const val kotlinVersion = "1.9.23"
const val org = "io.kotest.extensions"
const val dokkaVersion = "0.10.1"

object Kotest {
private const val version = "5.0.3"
private const val version = "5.8.1"
const val api = "io.kotest:kotest-framework-api:$version"
const val property = "io.kotest:kotest-property:$version"
const val junit5 = "io.kotest:kotest-runner-junit5:$version"
}

object Kotlinx {
const val kotlintime = "org.jetbrains.kotlinx:kotlinx-datetime:0.3.1"
const val kotlintime = "org.jetbrains.kotlinx:kotlinx-datetime:0.5.0"
}
}
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-7.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4d51c81

Please sign in to comment.