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

Fix maven references to stdlib-js in IDEA project

Browse Source 
#KT-15940
This commit is contained in:
Ilya Gorbunov
2017-01-26 00:21:21 +03:00
parent 078f606cdc
commit d0e917e7f9
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1.xml
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -48,4 +48,4 @@
</project>
<!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.2.xml
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -48,4 +48,4 @@
</project>
<!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml
Vendored
+2 -2
View File
@@ -20,11 +20,11 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
</project>
<!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml
Vendored
+1 -1
View File
@@ -41,4 +41,4 @@
</project>
<!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -41,4 +41,4 @@
</project>
<!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
idea/idea-maven/testData/maven-inspections/missingDependencies.xml
Vendored
+1 -1
View File
@@ -33,4 +33,4 @@
</project>
<!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+1 -1
View File
@@ -303,5 +303,5 @@ fun getStdlibArtifactId(sdk: Sdk?): String {
val MAVEN_STDLIB_ID = "kotlin-stdlib"
val MAVEN_STDLIB_ID_JRE7 = "kotlin-stdlib-jre7"
val MAVEN_STDLIB_ID_JRE8 = "kotlin-stdlib-jre8"
val MAVEN_JS_STDLIB_ID = "kotlin-js-library"
val MAVEN_JS_STDLIB_ID = "kotlin-stdlib-js"
val MAVEN_COMMON_STDLIB_ID = "kotlin-stdlib-common" // TODO: KotlinCommonMavenConfigurator
idea/testData/configuration/gradle/js_after.gradle
Vendored
+1 -1
View File
@@ -14,5 +14,5 @@ buildscript {
}
apply plugin: 'kotlin2js'
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
}