Merge branch 'master' into sks/IC-242

build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-
 buildscript {
    repositories {
       mavenCentral()
@@ -111,9 +109,9 @@ val plugins = listOf(
       deps = listOf("java", "org.jetbrains.plugins.gradle", "org.jetbrains.kotlin")
    ),
    PluginDescriptor(
-      since = "241.9959.2", // this version is 2024.1
+      since = "241.15989.150", // this version is 2024.1
       until = "241.*",
-      sdkVersion = "241.9959-EAP-CANDIDATE-SNAPSHOT",
+      sdkVersion = "IC-2024.1.1",
       sourceFolder = "IC-241",
       deps = listOf("java", "org.jetbrains.plugins.gradle", "org.jetbrains.kotlin")
    ),
@@ -160,12 +158,13 @@ dependencies {
    // needed for the resource files which are loaded into java light tests
    testImplementation(libs.test.kotest.framework.api)
    testImplementation(libs.test.kotest.assertions.core)
+   runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
 }
 
 sourceSets {
    main {
-      withConvention(KotlinSourceSet::class) {
-         kotlin.srcDirs("src/${descriptor.sourceFolder}/kotlin")
+      kotlin {
+         srcDir("src/${descriptor.sourceFolder}/kotlin")
       }
       resources {
          srcDir("src/${descriptor.sourceFolder}/resources")

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "1.9.23"
 runtime-kotest = "4.2.0"
 # We separate these from the actual runtime dependencies
 test-kotest = "5.8.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists