diff --git a/CHANGELOG b/CHANGELOG index a53d54561cd..b6cff6ab4dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +v2024.10.08 +=========== +Bug Fixes +* CLion Virtual Include Fixes #6759 +* Fixes for Query Sync (ready to use): #6833, #6834, #6835, #6841 +* [fix] Confirm if user wants to reimport instead of disallowing it #6839 +Features +* Implement JUnit5 support and parameterize tests #4473 +* [feature] Recognize WORKSPACE.bzlmod files #6853 + v2024.09.24 =========== Bug Fixes diff --git a/MODULE.bazel b/MODULE.bazel index e996c979dcc..626e1f15f03 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -370,9 +370,9 @@ http_archive( url = CLION_242_URL, ) -CLION_243_SHA = "b2b61d44c5a501e3209577b9164d56e6148020133ce4709f79c0be3a3cd17032" +CLION_243_SHA = "2f60f3206a3ac73b3a398df4fa6dc4343b42e835dab99c338d38b2f988fb47db" -CLION_243_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/243.16718.30-EAP-SNAPSHOT/clion-243.16718.30-EAP-SNAPSHOT.zip" +CLION_243_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/243.18137.40-EAP-SNAPSHOT/clion-243.18137.40-EAP-SNAPSHOT.zip" http_archive( name = "clion_2024_3", @@ -701,9 +701,9 @@ http_archive( url = SCALA_PLUGIN_242_URL, ) -SCALA_PLUGIN_243_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2024.3.4/org.intellij.scala-2024.3.4.zip" +SCALA_PLUGIN_243_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2024.3.5/org.intellij.scala-2024.3.5.zip" -SCALA_PLUGIN_243_SHA = "5f80536208756dce375df9d7ed86b09364074371aee720209cb377edad426950" +SCALA_PLUGIN_243_SHA = "2e46a224b046f8bdf04207f67b48b861f29d5431ba4ad611df2056f23b1e4de8" http_archive( name = "scala_2024_3", diff --git a/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java b/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java index a5fa8e6371f..5d1656eaad0 100644 --- a/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java +++ b/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java @@ -46,7 +46,6 @@ public class ExternalWorkspaceDataProvider { private final Project project; private volatile ExternalWorkspaceData externalWorkspaceData; - private ListenableFuture deps; public ExternalWorkspaceDataProvider(Project project) { this.project = project; @@ -105,13 +104,11 @@ public ListenableFuture getExternalWorkspaceData( .getBuildSystem() .getDefaultInvoker(project, context); - deps = BlazeModRunner.getInstance().getDeps(project, buildInvoker, context, importSettings.getBuildSystem(), blazeFlags); externalWorkspaceData = BlazeModRunner.getInstance() .dumpRepoMapping( project, buildInvoker, context, importSettings.getBuildSystem(), blazeFlags) .get(); - deps.get(); } catch (InterruptedException | ExecutionException e) { context.handleExceptionAsWarning( "Failed to run `blaze mod dump_repo_mapping` (completion of labels from module provided repos will be unavailable)",