azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove or replace deprecated kotlin-runtime artifact usages

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-08-12 04:33:24 +03:00
parent c8becbd335
commit 16148a30c1
13 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
+1 -1
View File
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
private static final String VERSIONS_LIST_URL =
"http://search.maven.org/solrsearch/select?q=g:%22org.jetbrains.kotlin%22+AND+a:%22kotlin-runtime%22&core=gav&rows=20&wt=json";
"http://search.maven.org/solrsearch/select?q=g:%22org.jetbrains.kotlin%22+AND+a:%22kotlin-stdlib%22&core=gav&rows=20&wt=json";
@NotNull private final String minimumVersion;
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
+2 -1
View File
@@ -119,7 +119,8 @@ fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: () -> Unit) {
}
}
private val VirtualFile.isStdLibFile: Boolean get() = presentableUrl.contains("kotlin-runtime.jar")
// looks like the entire uninvalidation is a dead code now
private val VirtualFile.isStdLibFile: Boolean get() = false // presentableUrl.contains("kotlin-runtime.jar")
fun invalidateLibraryCache(project: Project) {
LibraryModificationTracker.getInstance(project).incModificationCount()
idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
+2 -2
View File
@@ -114,8 +114,8 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest {
// Move fake runtime jar to default library path to pretend library is already configured
FileUtil.copy(
new File(getProject().getBasePath() + "/lib/kotlin-runtime.jar"),
new File(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-runtime.jar"));
new File(getProject().getBasePath() + "/lib/kotlin-stdlib.jar"),
new File(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-stdlib.jar"));
Companion.assertNotConfigured(module, Companion.getJAVA_CONFIGURATOR());
Companion.getJAVA_CONFIGURATOR().configure(myProject, Collections.<Module>emptyList());