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

Fix maven references to stdlib-js

Browse Source 
#KT-15940
This commit is contained in:
Ilya Gorbunov
2017-01-25 23:27:01 +03:00
parent ba1d7104a3
commit ea9be01034
20 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/browser-example-with-library/pom.xml
+2 -2
View File
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -95,7 +95,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes>
libraries/examples/browser-example/pom.xml
+2 -2
View File
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -90,7 +90,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes>
libraries/examples/js-example/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
libraries/examples/kotlin-js-library-example/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
libraries/kotlin.test/js/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
libraries/kotlin.test/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle
+1 -1
View File
@@ -22,7 +22,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
compile "org.mozilla:rhino:1.7.7.1"
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
+1 -1
View File
@@ -14,5 +14,5 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
}
task jarSources(type: Jar) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle
+1 -1
View File
@@ -15,7 +15,7 @@ repositories {
dependencies {
compile project(":libraryProject")
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
}
compileKotlin2Js.kotlinOptions.sourceMap = true
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
}
task jarSources(type: Jar) {
libraries/tools/kotlin-js-tests-junit/pom.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
</exclusion>
</exclusions>
</dependency>
libraries/tools/kotlin-js-tests/pom.xml
+2 -2
View File
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -109,7 +109,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes>
libraries/tools/kotlin-maven-plugin-test/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -50,7 +50,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml
+2 -2
View File
@@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -59,7 +59,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>kotlin-js-library</includeArtifactIds>
<includeArtifactIds>kotlin-stdlib-js</includeArtifactIds>
<outputDirectory>${build.outputDirectory}/lib</outputDirectory>
<includes>**\/*.js</includes>
<excludes>**\/*.meta.js</excludes> <!-- we don't need meta.js files in runtime -->
libraries/tools/pom.xml
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kotlin-js-tools</artifactId>
<packaging>pom</packaging>
<description>
A project to make it easier to compile and test the JS standard library as a single, repeatable build
</description>
<modules>
<module>kotlin-js-library</module>
<module>kotlin-js-tests</module>
<module>kotlin-js-tests-junit</module>
</modules>
</project>