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

Do not build modules with maven which are built with gradle.

Browse Source 
kotlin-maven-plugin-test:
Remove dependency on kotlin-test-parent that is no longer published and required.
Add dependency on kotlin-runtime as it's no longer coming transitively from kotlin-script-runtime.
Change kotlin version test to reflect manifest implementation title changes.
This commit is contained in:
Ilya Gorbunov
2017-03-29 09:50:59 +03:00
parent 356f8dd0d1
commit 97d1ffb036
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin-test/pom.xml
+1 -1
View File
@@ -125,6 +125,7 @@
<artifact>org.jetbrains.kotlin:kotlin-maven-plugin:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-maven-allopen:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-maven-noarg:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-runtime:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-script-runtime:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-stdlib:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-stdlib-common:${project.version}</artifact>
@@ -132,7 +133,6 @@
<artifact>org.jetbrains.kotlin:kotlin-stdlib-jre7:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-stdlib-jre8:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-reflect:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-test-parent:${project.version}:pom</artifact>
<artifact>org.jetbrains.kotlin:kotlin-test-common:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-test:${project.version}</artifact>
<artifact>org.jetbrains.kotlin:kotlin-test-js:${project.version}</artifact>
libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
+2 -3
View File
@@ -4,15 +4,14 @@ import java.net.URL
import java.util.jar.Attributes
import java.util.jar.Manifest
// "Kotlin Reflect" and "Kotlin Script Runtime" are different because unlike other libraries which are built with Maven, they're copied from dist
val LIBRARIES = listOf(
"kotlin-runtime",
"kotlin-stdlib",
"kotlin-stdlib-common",
"kotlin-stdlib-jre7",
"kotlin-stdlib-jre8",
"Kotlin Reflect",
"Kotlin Script Runtime"
"kotlin-reflect",
"kotlin-script-runtime"
)
const val KOTLIN_VERSION = "Kotlin-Version"