Merge pull request #428 from nils-a/release/8.0.2

Release/8.0.2
cake-build · May 8, 2024 · 2c0723b · 2c0723b
2 parents d479132 + 7132f73
commit 2c0723b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Validates the gradle wrappers and saves us from getting malicious PRs
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v2.1.1
+        uses: gradle/wrapper-validation-action@v3.3.0
 
       # Setup Java 11 environment which is needed to build
       - name: Setup Java

diff --git a/src/dotnet/Directory.Build.props b/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)' == ''">2024.1.0-eap03</SdkVersion>
+        <SdkVersion Condition="'$(SdkVersion)' == ''">2024.1.0</SdkVersion>
         <WaveVersion>$(SdkVersion.Substring(2,2))$(SdkVersion.Substring(5,1)).0.0</WaveVersion>
         <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     </PropertyGroup>
@@ -15,7 +15,7 @@
         <DebugType>full</DebugType>
         <DefineConstants>$(DefineConstants);TRACE;DEBUG;JET_MODE_ASSERT</DefineConstants>
     </PropertyGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>

diff --git a/src/dotnet/cake-rider/CakeTaskCollectorStage.cs b/src/dotnet/cake-rider/CakeTaskCollectorStage.cs
@@ -12,7 +12,6 @@ namespace net.cakebuild;
 /// <summary>
 /// Used to update tasks after initial solution load.
 /// </summary>
-[DaemonStage(StagesAfter = new[] { typeof(FilteringHighlightingDaemonStage) })]
 public sealed class CakeTaskCollectorStage : CSharpDaemonStageBase
 {
     private readonly ICakeFrostingProjectsHost _host;

diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts
@@ -17,11 +17,11 @@ plugins {
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
     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.23.5"
+    id("io.gitlab.arturbosch.detekt") version "1.23.6"
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
     id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
     // grammarkit to generate parser & lexer (i.e. the bnf and the flex file...)
-    id("org.jetbrains.grammarkit") version "2022.3.2.1"
+    id("org.jetbrains.grammarkit") version "2022.3.2.2"
 }
 
 val jvmVersion = "17"
@@ -34,7 +34,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.2")
@@ -113,8 +113,7 @@ tasks {
     // generate the lexer (uses grammarkit)
     generateLexer {
         sourceFile.set(File(rootDir, "src/main/kotlin/net/cakebuild/language/psi/Cake.flex"))
-        targetDir.set("src/main/gen/net/cakebuild/language/psi")
-        targetClass.set("CakeLexer")
+        targetOutputDir.set(File(rootDir, "src/main/gen/net/cakebuild/language/psi"))
         purgeOldFiles.set(true)
     }
 
@@ -151,7 +150,7 @@ tasks {
     // generate the parser (uses grammarkit)
     generateParser {
         sourceFile.set(File(rootDir, "src/main/kotlin/net/cakebuild/language/psi/Cake.bnf"))
-        targetRoot.set("src/main/gen")
+        targetRootOutputDir.set(File(rootDir, "src/main/gen"))
         pathToParser.set("/net/cakebuild/language/psi/CakeParser.java")
         pathToPsiRoot.set("/net/cakebuild/language/psi")
     }

diff --git a/src/rider/gradle.properties b/src/rider/gradle.properties
@@ -9,16 +9,16 @@ pluginUntilBuild = 241.*
 # 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-2024.1-EAP1
+pluginVerifierIdeVersions = RD-2024.1
 
 platformType = RD
 # platformVersion Examples:
 #   Release:  2024.1
 #   EAP:      2024.1-EAP2-SNAPSHOT
 #   Nightly:  2024.1-SNAPSHOT
-platformVersion = 2024.1-EAP1-SNAPSHOT
+platformVersion = 2024.1
 # dotNetSdkVersion should be equivalent to platformVersion!
-dotNetSdkVersion = 2024.1-eap01
+dotNetSdkVersion = 2024.1.0
 platformDownloadSources = false
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

diff --git a/src/rider/src/main/kotlin/net/cakebuild/actions/CakeTasksTreeAction.kt b/src/rider/src/main/kotlin/net/cakebuild/actions/CakeTasksTreeAction.kt
@@ -1,5 +1,6 @@
 package net.cakebuild.actions
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import net.cakebuild.shared.CakeDataKeys
@@ -10,6 +11,10 @@ abstract class CakeTasksTreeAction : AnAction() {
         return CakeDataKeys.TASKS_WINDOW.getData(e.dataContext)
     }
 
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.EDT
+    }
+
     class CollapseAll : CakeTasksTreeAction() {
         override fun actionPerformed(e: AnActionEvent) {
             val win = getWindow(e) ?: return