Merge pull request #364 from nils-a/release/7.0.0

Release/7.0.0

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
 
       # Validates the gradle wrappers and saves us from getting malicious PRs
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
 
       # Setup Java 11 environment which is needed to build
       - name: Setup Java
@@ -51,7 +51,7 @@ jobs:
 
       # Setup dotnet 6 (and 2.1 for Wyam, 3.1 for gitReleaseManager, 5.0 for gitVersion)
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: |
             2.1.x

recipe.cake

@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.IntelliJ.Recipe&version=0.2.2
+#load nuget:?package=Cake.IntelliJ.Recipe&version=0.2.4
 
 Environment.SetVariableNames(
   githubTokenVariable: "GITHUB_PAT"
@@ -18,7 +18,6 @@ IntelliJBuildParameters.SetParameters(
   preferredBuildAgentOperatingSystem: PlatformFamily.Linux
 );
 
-BuildParameters.IsDotNetCoreBuild = true; // so we get all the cool dotnet tools
 IntelliJBuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context);

src/dotnet/Directory.Build.props

@@ -6,7 +6,7 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <DebugType>pdbonly</DebugType>
         <!-- will be injected by gradle at build -->
-        <SdkVersion Condition="'$(SdkVersion)' == ''">2023.1.0</SdkVersion>
+        <SdkVersion Condition="'$(SdkVersion)' == ''">2023.2.0</SdkVersion>
         <WaveVersion>$(SdkVersion.Substring(2,2))$(SdkVersion.Substring(5,1)).0.0</WaveVersion>
         <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     </PropertyGroup>

src/dotnet/cake-rider/CakeFrostingProjectsHost.cs

@@ -11,7 +11,7 @@
 using JetBrains.ProjectModel.ProjectsHost;
 using JetBrains.ProjectModel.Tasks;
 using JetBrains.Rd.Base;
-using JetBrains.RdBackend.Common.Features;
+using JetBrains.ReSharper.Feature.Services.Protocol;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.Caches;
 using JetBrains.ReSharper.Psi.Caches.SymbolCache;

src/dotnet/cake-rider/TaskMarker/TaskMarkerGutterMark.cs

@@ -5,7 +5,7 @@
 using JetBrains.Application.UI.Controls.BulbMenu.Anchors;
 using JetBrains.Application.UI.Controls.BulbMenu.Items;
 using JetBrains.ProjectModel;
-using JetBrains.RdBackend.Common.Features;
+using JetBrains.ReSharper.Feature.Services.Protocol;
 using JetBrains.ReSharper.Features.Running;
 using JetBrains.ReSharper.Resources.Shell;
 using JetBrains.Rider.Backend.Features.RunConfiguration;

src/rider/build.gradle.kts

@@ -11,20 +11,19 @@ plugins {
     // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
     id("org.jetbrains.kotlin.jvm") version "1.8.0"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.13.3"
-    id("com.jetbrains.rdgen") version "2023.1.2"
+    id("org.jetbrains.intellij") version "1.15.0"
+    id("com.jetbrains.rdgen") version "2023.3.0"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "2.0.0"
+    id("org.jetbrains.changelog") version "2.2.0"
     // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
-    id("io.gitlab.arturbosch.detekt") version "1.22.0"
+    id("io.gitlab.arturbosch.detekt") version "1.23.1"
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
+    id("org.jlleitschuh.gradle.ktlint") version "11.5.1"
     // grammarkit to generate parser & lexer (i.e. the bnf and the flex file...)
     id("org.jetbrains.grammarkit") version "2022.3.1"
 }
 
 val jvmVersion = "17"
-val kotlinVersion = "1.8" // should match org.jetbrains.kotlin.jvm (major.minor)
 
 group = properties("pluginGroup")
 version = properties("pluginVersion")
@@ -34,12 +33,12 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.3")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.3")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.0")
 }
 
 // Configure gradle-intellij-plugin plugin.
@@ -60,10 +59,14 @@ intellij {
     )
 }
 
+kotlin {
+    jvmToolchain(jvmVersion.toInt())
+}
+
 // Configure detekt plugin.
 // Read more: https://detekt.github.io/detekt/kotlindsl.html
 detekt {
-    config = files("./detekt-config.yml")
+    config.setFrom(listOf(File(rootDir, "detekt-config.yml")))
     buildUponDefaultConfig = true
 }
 
@@ -245,16 +248,9 @@ tasks {
         }
     }
 
-    withType<JavaCompile> {
-        sourceCompatibility = jvmVersion
-        targetCompatibility = jvmVersion
-    }
     withType<KotlinCompile> {
         dependsOn(generateLexer, generateParser, rdgen)
         kotlinOptions {
-            jvmTarget = jvmVersion
-            languageVersion = kotlinVersion
-            apiVersion = kotlinVersion
             freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
         }
     }

src/rider/gradle.properties

@@ -4,15 +4,15 @@
 pluginGroup = net.cakebuild
 pluginName = cake-rider
 pluginVersion = 0.1.0-alpha.1
-pluginSinceBuild = 231
-pluginUntilBuild = 231.*
+pluginSinceBuild = 232
+pluginUntilBuild = 232.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
 # or https://data.services.jetbrains.com/products?fields=name,releases.downloads,releases.version,releases.build,releases.type&code=RD
-pluginVerifierIdeVersions = RD-2023.1
+pluginVerifierIdeVersions = RD-2023.2
 
 platformType = RD
-platformVersion = 2023.1.4
+platformVersion = 2023.2
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
@@ -29,4 +29,16 @@ marketplaceChannel = development
 dotNetConfiguration = Release
 
 # optionally force the prepareSandbox task to always run
-forcePrepareSandbox = false
+forcePrepareSandbox = false
+
+# Gradle Releases -> https://github.com/gradle/gradle/releases
+gradleVersion = 8.3
+
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.configuration-cache = true
+
+# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
+org.gradle.caching = true
+
+# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
+systemProp.org.gradle.unsafe.kotlin.assignment = true

src/rider/settings.gradle.kts

@@ -17,6 +17,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+}
+
 rootProject.name = "cake-rider"
 
 include(":protocol")

src/rider/src/main/kotlin/net/cakebuild/beforeRunner/EnsureNetToolBeforeRunTaskProvider.kt

@@ -11,7 +11,6 @@ import net.cakebuild.installers.CakeNetToolInstaller
 import net.cakebuild.run.script.CakeScriptConfiguration
 import net.cakebuild.shared.CakeBalloonNotifications
 
-@Suppress("DialogTitleCapitalization")
 class EnsureNetToolBeforeRunTaskProvider :
     BeforeRunTaskProvider<EnsureNetToolBeforeRunTaskProvider.EnsureNetToolBeforeRunTask>() {
     companion object {

src/rider/src/main/kotlin/net/cakebuild/beforeRunner/RestoreNetToolsBeforeRunTaskProvider.kt

@@ -13,7 +13,6 @@ import icons.CakeIcons
 import net.cakebuild.run.script.CakeScriptConfiguration
 import net.cakebuild.shared.CakeBalloonNotifications
 
-@Suppress("DialogTitleCapitalization")
 class RestoreNetToolsBeforeRunTaskProvider :
     BeforeRunTaskProvider<RestoreNetToolsBeforeRunTaskProvider.RestoreNetToolsBeforeRunTask>() {
     companion object {

src/rider/src/main/kotlin/net/cakebuild/language/codeInsight/TaskInlayHintsProvider.kt

@@ -14,7 +14,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.elementType
 import com.intellij.refactoring.suggested.startOffset
-import com.intellij.ui.layout.panel
+import com.intellij.ui.dsl.builder.panel
 import net.cakebuild.language.psi.CakeTypes
 import net.cakebuild.shared.CakeScriptProject
 import net.cakebuild.shared.CakeTaskRunMode
@@ -34,7 +34,7 @@ class TaskInlayHintsProvider : InlayHintsProvider<TaskInlayHintsProvider.Setting
             Task("Default");
             bar();
             Task("Some Task")
-              .Does(() => 
+              .Does(() =>
               {
               // some stuff...
               });
@@ -78,17 +78,15 @@ class TaskInlayHintsProvider : InlayHintsProvider<TaskInlayHintsProvider.Setting
                     factory.container(
                         factory.smallText("Run Task")
                     ),
-                    object : InlayPresentationFactory.ClickListener {
-                        override fun onClick(event: MouseEvent, translated: Point) {
-                            if (event.clickCount == 2) {
-                                val project = element.containingFile.project
-                                CakeScriptProject.runCakeTarget(
-                                    project,
-                                    element.containingFile.virtualFile,
-                                    taskName,
-                                    CakeTaskRunMode.Run
-                                )
-                            }
+                    { event, _ ->
+                        if (event.clickCount == 2) {
+                            val project = element.containingFile.project
+                            CakeScriptProject.runCakeTarget(
+                                project,
+                                element.containingFile.virtualFile,
+                                taskName,
+                                CakeTaskRunMode.Run
+                            )
                         }
                     },
                     object : InlayPresentationFactory.HoverListener {

src/rider/src/main/kotlin/net/cakebuild/settings/CakeGeneralSettingsConfigurable.kt

@@ -39,7 +39,7 @@ class CakeGeneralSettingsConfigurable(private val project: Project) : Configurab
             Pair({ settings.cakeTaskParsingRegex }, { editor.taskRegexField })
         )
         val modified = pairs.any {
-            isModified(it.second(), it.first())
+            Configurable.isFieldModified(it.second(), it.first())
         }
         if (modified) {
             return true

src/rider/src/main/kotlin/net/cakebuild/settings/CakeRunnerSettingsConfigurable.kt

@@ -26,7 +26,7 @@ class CakeRunnerSettingsConfigurable(private val project: Project) : Configurabl
             Pair({ settings.cakeRunner }, { editor.cakeRunnerField })
         )
         val textFieldsModified = pairs.any {
-            isModified(it.second(), it.first())
+            Configurable.isFieldModified(it.second(), it.first())
         }
 
         if (textFieldsModified) {
@@ -37,7 +37,7 @@ class CakeRunnerSettingsConfigurable(private val project: Project) : Configurabl
             return true
         }
 
-        if (isModified(editor.useNetTool, settings.cakeUseNetTool)) {
+        if (Configurable.isCheckboxModified(editor.useNetTool, settings.cakeUseNetTool)) {
             return true
         }
         return false

src/rider/src/main/kotlin/net/cakebuild/shared/ui/VerbosityComboBox.kt

@@ -18,7 +18,7 @@ class VerbosityComboBox : JComboBox<String>() {
     }
 
     fun getVerbosity(): String {
-        return ((selectedItem ?: DEFAULT) as String).toLowerCase()
+        return ((selectedItem ?: DEFAULT) as String).lowercase()
     }
 
     fun setVerbosity(verbosity: String?) {

src/rider/src/main/kotlin/net/cakebuild/toolwindow/CakeTasksWindow.kt

@@ -234,9 +234,8 @@ class CakeTasksWindow(private val project: Project) : SimpleToolWindowPanel(true
                     else -> {
                         // do not modify the label - it's probably fine the way it is.
                         log.trace(
-                            "found userObject of ${
-                            data?.javaClass?.name ?: "[null]"
-                            } to override the label '${label.text}'"
+                            "found userObject of ${data?.javaClass?.name ?: "[null]"} " +
+                                "to override the label '${label.text}'"
                         )
                     }
                 }