Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to gradle 8.7 #297

Merged
merged 7 commits into from
May 27, 2024
Merged

Upgrade to gradle 8.7 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ef8865
Upgrade to gradle 8.7
sksamuel May 27, 2024
d841224
Use final ic 241
sksamuel May 27, 2024
907c410
kotlin = "1.9.23"
sksamuel May 27, 2024
db01926
moar
sksamuel May 27, 2024
005949c
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
sksamuel May 27, 2024
f9baeaa
compileOnly
sksamuel May 27, 2024
d320710
runtimeOnly
sksamuel May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build.gradle.kts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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