Skip to content

Commit e13ca5c

Browse files
faogustavointellij-monorepo-bot
authored andcommitted
[JEWEL-988] Updating Jewel Gradle project to Gradle 9
closes #3263 GitOrigin-RevId: eb609ba93a3f9d502602dbca8647c65d7ebc9b31
1 parent 0ef2021 commit e13ca5c

File tree

8 files changed

+15
-17
lines changed

8 files changed

+15
-17
lines changed

platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import com.ncorti.ktfmt.gradle.tasks.KtfmtBaseTask
22
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
import org.jmailen.gradle.kotlinter.tasks.FormatTask
4+
import org.jmailen.gradle.kotlinter.tasks.LintTask
35

46
plugins {
57
id("jewel-linting")
@@ -56,17 +58,15 @@ kotlin {
5658
}
5759

5860
tasks {
59-
// We need to use relative paths for patterns.
60-
// Exclude does not work; this is how the Kotlinter plugin docs recommend doing it, and it works...
6161
val buildDir = layout.buildDirectory.asFile.get().relativeTo(project.projectDir).path
62-
detektMain { source = (source - fileTree(buildDir)).asFileTree }
62+
detektMain { exclude { it.file.path.contains(buildDir) } }
6363

64-
formatKotlinMain { source = (source - fileTree(buildDir)).asFileTree }
64+
withType<KtfmtBaseTask> { exclude { it.file.path.contains(buildDir) } }
6565

66-
withType<KtfmtBaseTask> { source = (source - fileTree(buildDir)).asFileTree }
66+
withType<FormatTask> { exclude { it.file.path.contains(buildDir) } }
6767

68-
lintKotlinMain {
69-
source = (source - fileTree(buildDir)).asFileTree
68+
withType<LintTask> {
69+
exclude { it.file.path.contains(buildDir) }
7070

7171
reports = provider {
7272
mapOf(

platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/metalava/CheckMetalavaApiTask.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package org.jetbrains.jewel.buildlogic.metalava
55

66
import javax.inject.Inject
77
import org.gradle.api.DefaultTask
8+
import org.gradle.api.GradleException
89
import org.gradle.api.file.ConfigurableFileCollection
910
import org.gradle.api.file.RegularFileProperty
1011
import org.gradle.api.provider.Property

platform/jewel/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ junitJupiter = "5.13.4"
1515
junitPlatform = "1.13.4"
1616
kotlin = "2.1.20"
1717
kotlinpoet = "2.1.0"
18-
kotlinterGradlePlugin = "5.0.1"
18+
kotlinterGradlePlugin = "5.2.0"
1919
kotlinxSerialization = "1.8.0"
2020
ktfmtGradlePlugin = "0.23.0"
2121
metalava = "1.0.0-alpha13"
1.65 KB
Binary file not shown.

platform/jewel/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

platform/jewel/gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform/jewel/gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform/jewel/int-ui/int-ui-standalone/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import io.gitlab.arturbosch.detekt.Detekt
22
import org.jetbrains.jewel.buildlogic.metalava.GenerateMetalavaApiTask
33
import org.jetbrains.jewel.buildlogic.theme.IntelliJThemeGeneratorTask
4+
import org.jmailen.gradle.kotlinter.tasks.LintTask
45

56
plugins {
67
jewel
@@ -41,7 +42,7 @@ tasks {
4142
}
4243

4344
val generateThemes by
44-
register("generateThemes") {
45+
register<Task>("generateThemes") {
4546
description = "Updates the ThemeDescription dumps and reformats them."
4647
dependsOn(themeGeneratorTasks)
4748
dependsOn(ktfmtFormatMain)
@@ -54,7 +55,7 @@ tasks {
5455
mustRunAfter(ktfmtFormatMain)
5556
}
5657

57-
lintKotlinMain {
58+
withType<LintTask> {
5859
mustRunAfter(generateThemes)
5960
mustRunAfter(ktfmtFormatMain)
6061
}

0 commit comments

Comments
 (0)