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

[Gradle, JS] Dukat change default mode onto source

Browse Source 
- Binary only for legacy

^KT-42339 fixed
This commit is contained in:
Ilya Goncharov
2020-10-19 14:22:12 +03:00
parent 0ce6d694b7
commit 0367dec035
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt
+2 -2
View File
@@ -107,7 +107,7 @@ class DukatIntegrationIT : BaseGradleIT() {
} }
val externalSrcs = "build/externals/$projectName/src" val externalSrcs = "build/externals/$projectName/src"
project.build("generateExternalsIntegrated") { project.build("compileKotlinJs") {
assertSuccessful() assertSuccessful()
assertSingleFileExists(externalSrcs, "index.module_decamelize.kt") assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
@@ -162,7 +162,7 @@ class DukatIntegrationIT : BaseGradleIT() {
} }
val externalSrcs = "build/externals/$projectName/src" val externalSrcs = "build/externals/$projectName/src"
project.build("generateExternalsIntegrated") { project.build("compileKotlinJs") {
assertSuccessful() assertSuccessful()
assertSingleFileExists(externalSrcs, "index.module_decamelize.kt") assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt
+2 -2
View File
@@ -34,10 +34,10 @@ open class KotlinJsCompilation(
private val kotlinProperties = PropertiesProvider(target.project) private val kotlinProperties = PropertiesProvider(target.project)
internal val externalsOutputFormat: ExternalsOutputFormat internal open val externalsOutputFormat: ExternalsOutputFormat
get() = kotlinProperties.externalsOutputFormat ?: defaultExternalsOutputFormat get() = kotlinProperties.externalsOutputFormat ?: defaultExternalsOutputFormat
internal open val defaultExternalsOutputFormat: ExternalsOutputFormat = ExternalsOutputFormat.BINARY internal open val defaultExternalsOutputFormat: ExternalsOutputFormat = ExternalsOutputFormat.SOURCE
override val kotlinOptions: KotlinJsOptions = KotlinJsOptionsImpl() override val kotlinOptions: KotlinJsOptions = KotlinJsOptionsImpl()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
+3 -1
View File
@@ -45,7 +45,9 @@ internal class DukatCompilationResolverPlugin(
val target = compilation.target val target = compilation.target
if (target is KotlinJsIrTarget || target is KotlinJsTarget && externalsOutputFormat != ExternalsOutputFormat.SOURCE) { val legacyTargetNotReuseIrTask =
target is KotlinJsTarget && (target.irTarget == null || externalsOutputFormat != ExternalsOutputFormat.SOURCE)
if (target is KotlinJsIrTarget || legacyTargetNotReuseIrTask) {
compilation.compileKotlinTaskProvider.dependsOn(integratedTask) compilation.compileKotlinTaskProvider.dependsOn(integratedTask)
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt
+1 -2
View File
@@ -17,8 +17,7 @@ class KotlinJsIrCompilation(
name: String name: String
) : KotlinJsCompilation(target, name) { ) : KotlinJsCompilation(target, name) {
override val defaultExternalsOutputFormat: ExternalsOutputFormat override val externalsOutputFormat: ExternalsOutputFormat = ExternalsOutputFormat.SOURCE
get() = ExternalsOutputFormat.SOURCE
internal val allSources: MutableSet<SourceDirectorySet> = mutableSetOf() internal val allSources: MutableSet<SourceDirectorySet> = mutableSetOf()