From f972eb7c3b3812715a6842e3e4f0be912d1c8a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 26 Sep 2024 11:56:19 +0200 Subject: [PATCH] IJPL-162923 DevKit: broken classpath, error logged GitOrigin-RevId: 3329cb71bd99b6f50a8f1f29e794936028943e4d --- plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java | 2 ++ .../devkit-core/src/projectRoots/IdeaJdkConfigurable.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java index e2105f96aea4..0e5afdd616b9 100644 --- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java +++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java @@ -160,6 +160,8 @@ public final class IdeaJdk extends JavaDependentSdkType implements JavaSdkType { private static VirtualFile[] getIdeaLibrary(String home) { List result = new ArrayList<>(); + appendIdeaLibrary(home, result, "junit.jar", "junit4.jar"); // DO NOT REMOVE + ProductInfo productInfo = ProductInfoKt.loadProductInfo(home); if (productInfo != null) { final JarFileSystem jfs = JarFileSystem.getInstance(); diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java index fb1ebb6c6290..1e4e10ea68f4 100644 --- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java +++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.idea.devkit.projectRoots; import com.intellij.openapi.application.ApplicationManager; @@ -183,7 +183,6 @@ public class IdeaJdkConfigurable implements AdditionalDataConfigurable { final SdkModificator modificator = myIdeaJdk.getSdkModificator(); modificator.setSdkAdditionalData(sandbox); ApplicationManager.getApplication().runWriteAction(modificator::commitChanges); - ((ProjectJdkImpl) myIdeaJdk).resetVersionString(); myModified = false; }