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

Specify module name via moduleName option instead of freeCompilerArgs

Browse Source 
This allows to get rid of warnings about duplicate module name in some
of the modules.
This commit is contained in:
Alexander Udalov
2020-11-02 10:10:25 +01:00
parent bdb8a58b3b
commit d326d6a693
13 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin.test/junit/build.gradle
+2 -1
View File
@@ -31,7 +31,8 @@ configureSourcesJar()
configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
kotlinOptions.moduleName = project.name
}
compileTestKotlin {
libraries/kotlin.test/junit5/build.gradle
+2 -1
View File
@@ -41,7 +41,8 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
}
compileKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
kotlinOptions.moduleName = project.name
}
compileTestKotlin {
libraries/kotlin.test/jvm/build.gradle
+2 -2
View File
@@ -45,8 +45,8 @@ configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-module-name", project.archivesBaseName, ]
"-Xopt-in=kotlin.contracts.ExperimentalContracts"]
kotlinOptions.moduleName = project.archivesBaseName
}
compileTestKotlin {
libraries/kotlin.test/testng/build.gradle
+2 -1
View File
@@ -34,7 +34,8 @@ configureSourcesJar()
configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
kotlinOptions.moduleName = project.name
}
compileTestKotlin {