Skip to content

Commit 0adb0d1

Browse files
LeFroschLeFrosch
authored
Bump Intellij 251 SDK versions (bazelbuild#7553)
1 parent 6e2fcb7 commit 0adb0d1

File tree

11 files changed

+61
-43
lines changed

11 files changed

+61
-43
lines changed

‎MODULE.bazel

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ http_archive(
204204
)
205205

206206
# The plugin api for intellij_ce_2025_1. This is required to build IJwB and run integration tests.
207-
IC_251_SHA = "86dd6617de5054dfbe2150bb005c4739c833adc1fee437d87e698eac03cf15dc"
207+
IC_251_SHA = "1cc5f8e24b8337d9dcac75c6aa26274e93d36e47be0a1b528dc81590c3743a31"
208208

209-
IC_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/251.14649.49-EAP-SNAPSHOT/ideaIC-251.14649.49-EAP-SNAPSHOT.zip"
209+
IC_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/251.23774.200-EAP-SNAPSHOT/ideaIC-251.23774.200-EAP-SNAPSHOT.zip"
210210

211211
http_archive(
212212
name = "intellij_ce_2025_1",
@@ -238,9 +238,9 @@ http_archive(
238238
)
239239

240240
# The plugin api for intellij_ce_2025_1. This is required to build IJwB and run integration tests.
241-
IU_251_SHA = "c151b4ee53182b10bca4c8849f76960c4f7f27b41904f4f243858cb982fa3760"
241+
IU_251_SHA = "4ce2b19bdb4b07cb05cce34811210ce55b84552d4279ff1ffd4b3143c2212da8"
242242

243-
IU_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/251.14649.49-EAP-SNAPSHOT/ideaIU-251.14649.49-EAP-SNAPSHOT.zip"
243+
IU_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/251.23774.200-EAP-SNAPSHOT/ideaIU-251.23774.200-EAP-SNAPSHOT.zip"
244244

245245
http_archive(
246246
name = "intellij_ue_2025_1",
@@ -271,9 +271,9 @@ http_archive(
271271
url = CLION_243_URL,
272272
)
273273

274-
CLION_251_SHA = "e35e0b8a2d55e8f2d2fccb3f3baf0f15a71410516b3eeba232f9c772ffd941c4"
274+
CLION_251_SHA = "6638b32c6257a94eb53daedce5a08add2dfa6dab0377828d9b655fc03780a39c"
275275

276-
CLION_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/251.18673.49-EAP-SNAPSHOT/clion-251.18673.49-EAP-SNAPSHOT.zip"
276+
CLION_251_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/251.23774.202-EAP-SNAPSHOT/clion-251.23774.202-EAP-SNAPSHOT.zip"
277277

278278
http_archive(
279279
name = "clion_2025_1",
@@ -312,9 +312,9 @@ http_archive(
312312
url = DEVKIT_243_URL,
313313
)
314314

315-
DEVKIT_251_SHA = "d7e48245cb09607204d6b31347c982b7a3cf74c3b112406252e950eea63bcf7b"
315+
DEVKIT_251_SHA = "f3953afd1020941123b1e98c9035d168a7fe9df4e712adfa281f30088aa5c429"
316316

317-
DEVKIT_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/251.14649.49/DevKit-251.14649.49.zip"
317+
DEVKIT_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/251.23774.200/DevKit-251.23774.200.zip"
318318

319319
http_archive(
320320
name = "devkit_2025_1",
@@ -358,9 +358,9 @@ http_archive(
358358
url = PYTHON_PLUGIN_243_URL,
359359
)
360360

361-
PYTHON_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/251.14649.49/PythonCore-251.14649.49.zip"
361+
PYTHON_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/251.23774.200/PythonCore-251.23774.200.zip"
362362

363-
PYTHON_PLUGIN_251_SHA = "2dbe044e1f7cec4368d927f59962b0916e3d4ba06b3a6100114ccad386ad1636"
363+
PYTHON_PLUGIN_251_SHA = "93bce7409a0dac9b36ef3eacb3ba5802c368267bcde4dae436da862eca32f11e"
364364

365365
http_archive(
366366
name = "python_2025_1",
@@ -399,9 +399,9 @@ http_archive(
399399
url = GO_PLUGIN_243_URL,
400400
)
401401

402-
GO_PLUGIN_251_SHA = "e481abb6d206d420bc3eb5d362af02c1f9d28800012f0700a2ca04941f8471ad"
402+
GO_PLUGIN_251_SHA = "c3f28a277f8118880fbadfe18312e2e3d1a6510a623e6fc104fcac52664b27df"
403403

404-
GO_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/251.14649.49/org.jetbrains.plugins.go-251.14649.49.zip"
404+
GO_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/251.23774.200/org.jetbrains.plugins.go-251.23774.200.zip"
405405

406406
http_archive(
407407
name = "go_2025_1",
@@ -440,9 +440,9 @@ http_archive(
440440
url = SCALA_PLUGIN_243_URL,
441441
)
442442

443-
SCALA_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2025.1.1/org.intellij.scala-2025.1.1.zip"
443+
SCALA_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2025.1.16/org.intellij.scala-2025.1.16.zip"
444444

445-
SCALA_PLUGIN_251_SHA = "bfec18cc757a908fb21e646c7d110ee9386b116a596a7ad982aaedbaa90b3817"
445+
SCALA_PLUGIN_251_SHA = "6ee8e65a4b4d904979c0bab9c2c43129c63e08b587632eccf8797847ee8ffb7c"
446446

447447
http_archive(
448448
name = "scala_2025_1",
@@ -482,9 +482,9 @@ http_archive(
482482
url = TOML_PLUGIN_243_URL,
483483
)
484484

485-
TOML_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/251.14649.45/org.toml.lang-251.14649.45.zip"
485+
TOML_PLUGIN_251_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/251.23774.216/org.toml.lang-251.23774.216.zip"
486486

487-
TOML_PLUGIN_251_SHA = "a5a717340ed02d913902445aa88c472dcd6bccc2a8fa3c3ef871d1b93568cf1a"
487+
TOML_PLUGIN_251_SHA = "c83595c76169c9d9193fa9b3b4e452fdb512769cfd0e795befe93c5ffa612932"
488488

489489
http_archive(
490490
name = "toml_2025_1",

‎clwb/src/com/google/idea/blaze/clwb/run/BlazeDebuggerKind.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public static BlazeDebuggerKind byDefaultToolchain() {
5353

5454
return switch (kind) {
5555
case BUNDLED_GDB, CUSTOM_GDB -> gdbBundledOrServer();
56-
case BUNDLED_LLDB -> BUNDLED_LLDB;
56+
// case BUNDLED_LLDB, CUSTOM_LLDB, use default for SDK compat reasons
57+
default -> BUNDLED_LLDB;
5758
};
5859
}
5960

‎intellij_platform_sdk/BUILD.idea251

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ java_import(
129129
"plugins/java-i18n/lib/*.jar",
130130
"plugins/junit/lib/*.jar",
131131
"plugins/properties/lib/*.jar",
132+
"plugins/json/lib/*.jar",
133+
"plugins/json/lib/modules/*.jar",
134+
"plugins/toml/lib/*.jar",
132135
]),
133136
tags = ["intellij-provided-by-sdk"],
134137
)

‎intellij_platform_sdk/BUILD.ue251

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ java_import(
158158
"plugins/java-i18n/lib/*.jar",
159159
"plugins/junit/lib/*.jar",
160160
"plugins/properties/lib/*.jar",
161+
"plugins/json/lib/*.jar",
162+
"plugins/json/lib/modules/*.jar",
163+
"plugins/toml/lib/*.jar",
161164
]),
162165
tags = ["intellij-provided-by-sdk"],
163166
)

‎javascript/tests/integrationtests/com/google/idea/blaze/javascript/run/smrunner/BlazeJavascriptWebTestEventsHandlerTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,10 @@ public void testJasmineTestResolves() {
250250

251251
JasmineFileStructure barFileStructure =
252252
JasmineFileStructureBuilder.getInstance().buildTestFileStructure(barFile);
253-
JasmineSuiteStructure barSuite = barFileStructure.findTopLevelSuiteByName("bar");
253+
JasmineSuiteStructure barSuite = barFileStructure.getSuites().stream()
254+
.filter((it) -> it.getName().equals("bar"))
255+
.findFirst()
256+
.orElse(null);
254257
assertThat(barSuite).isNotNull();
255258
JasmineSuiteStructure nestedSuite = barSuite.findChildSuiteByName("nested");
256259
assertThat(nestedSuite).isNotNull();

‎javascript/tests/integrationtests/com/google/idea/blaze/javascript/run/smrunner/BlazeWebJavascriptTestEventsHandlerTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,10 @@ public void testJasmineTestResolves() {
252252

253253
JasmineFileStructure barFileStructure =
254254
JasmineFileStructureBuilder.getInstance().buildTestFileStructure(barFile);
255-
JasmineSuiteStructure barSuite = barFileStructure.findTopLevelSuiteByName("bar");
255+
JasmineSuiteStructure barSuite = barFileStructure.getSuites().stream()
256+
.filter((it) -> it.getName().equals("bar"))
257+
.findFirst()
258+
.orElse(null);
256259
assertThat(barSuite).isNotNull();
257260
JasmineSuiteStructure nestedSuite = barSuite.findChildSuiteByName("nested");
258261
assertThat(nestedSuite).isNotNull();

‎scala/src/com/google/idea/blaze/scala/sync/BlazeScalaSyncPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import org.jetbrains.plugins.scala.project.ScalaLibraryProperties;
5454
import org.jetbrains.plugins.scala.project.ScalaLibraryType;
5555
import scala.Option;
56-
import scala.collection.immutable.List$;
56+
import scala.collection.immutable.Seq$;
5757

5858
/** Supports scala. */
5959
public class BlazeScalaSyncPlugin implements BlazeSyncPlugin {
@@ -105,7 +105,7 @@ public void updateProjectStructure(
105105
// TODO: We could pick the min or max version, but either choice is problematic, see SCL-18866.
106106
// TODO: The best solution would be letting the user specify the expected Scala version explicitly
107107
if (library.getName() != null && isRuntimeLibrary(library.getName())) {
108-
ScalaLibraryProperties properties = ScalaLibraryProperties.apply(libraryVersion(library.getName()), List$.MODULE$.<File>empty(), List$.MODULE$.<File>empty());
108+
ScalaLibraryProperties properties = ScalaLibraryProperties.apply(libraryVersion(library.getName()), Seq$.MODULE$.<File>empty(), Seq$.MODULE$.<File>empty());
109109
ExistingLibraryEditor editor = new ExistingLibraryEditor(library, null);
110110
editor.setType(ScalaLibraryType.apply());
111111
editor.setProperties(properties);

‎sdkcompat/v251/com/google/idea/sdkcompat/javascript/DelegatingTypeScriptConfigServiceCompat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected DelegatingTypeScriptConfigServiceCompat(TypeScriptConfigService impl)
1212
}
1313

1414
@Override
15-
public IntPredicate getFilterId(VirtualFile scope, boolean useProjectScopeGraph) {
16-
return impl.getFilterId(scope, useProjectScopeGraph);
15+
public IntPredicate getFilterId(VirtualFile scope) {
16+
return impl.getFilterId(scope);
1717
}
1818
}

‎sdkcompat/v251/com/google/idea/sdkcompat/javascript/TypeScriptConfigServiceAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public abstract class TypeScriptConfigServiceAdapter implements TypeScriptConfigService {
77

88
@Override
9-
public IntPredicate getFilterId(VirtualFile scope, boolean useProjectScopeGraph) {
9+
public IntPredicate getFilterId(VirtualFile scope) {
1010
return i -> true;
1111
}
1212
}

‎maintenance/BUILD renamed to ‎tools/maintenance/BUILD

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library")
15+
load("@rules_java//java:defs.bzl", "java_binary")
1516

16-
kt_jvm_binary(
17+
kt_jvm_library(
18+
name = "lib",
19+
srcs = ["maintenance.kt"],
20+
deps = ["@com_google_guava_guava//jar"],
21+
)
22+
23+
java_binary(
1724
name = "maintenance",
18-
srcs = glob(["maintenance.kt"]),
1925
main_class = "MaintenanceKt",
20-
deps = [
21-
"@com_google_guava_guava//jar",
22-
],
26+
runtime_deps = [":lib"] ,
2327
)

0 commit comments

Comments
 (0)