Skip to content

Commit

Permalink
Upgrade to gradle 8.7 (#297)
Browse files Browse the repository at this point in the history
  • Loading branch information
sksamuel authored May 27, 2024
1 parent b9ef132 commit 9ef5e43
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet

buildscript {
repositories {
mavenCentral()
Expand Down Expand Up @@ -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")
),
Expand Down Expand Up @@ -153,12 +151,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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
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-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 9ef5e43

Please sign in to comment.