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

[Gradle, JS] Add nowarn flag for kotlin2js

Browse Source 
^KT-41340 fixed
This commit is contained in:
Ilya Goncharov
2020-08-20 14:21:50 +03:00
parent aeae898b94
commit 2d8643b6ef
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+8 -3
View File
@@ -6,7 +6,9 @@
package org.jetbrains.kotlin.gradle.plugin package org.jetbrains.kotlin.gradle.plugin
import com.android.build.gradle.* import com.android.build.gradle.*
import com.android.build.gradle.api.* import com.android.build.gradle.api.AndroidSourceSet
import com.android.build.gradle.api.BaseVariant
import com.android.build.gradle.api.SourceKind
import org.gradle.api.* import org.gradle.api.*
import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer
import org.gradle.api.artifacts.maven.MavenResolver import org.gradle.api.artifacts.maven.MavenResolver
@@ -29,7 +31,7 @@ import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.internal.* import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
import org.jetbrains.kotlin.gradle.internal.checkAndroidAnnotationProcessorDependencyUsage import org.jetbrains.kotlin.gradle.internal.checkAndroidAnnotationProcessorDependencyUsage
import org.jetbrains.kotlin.gradle.internal.customizeKotlinDependencies import org.jetbrains.kotlin.gradle.internal.customizeKotlinDependencies
import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.logging.kotlinDebug
@@ -655,6 +657,7 @@ internal open class Kotlin2JsPlugin(
companion object { companion object {
private const val targetName = "2Js" private const val targetName = "2Js"
internal const val NOWARN_2JS_FLAG = "kotlin.2js.nowarn"
} }
override fun buildSourceSetProcessor( override fun buildSourceSetProcessor(
@@ -667,7 +670,9 @@ internal open class Kotlin2JsPlugin(
) )
override fun apply(project: Project) { override fun apply(project: Project) {
project.logger.warn(jsPluginDeprecationMessage("kotlin2js")) if (!PropertiesProvider(project).noWarn2JsPlugin) {
project.logger.warn(jsPluginDeprecationMessage("kotlin2js"))
}
val target = KotlinWithJavaTarget<KotlinJsOptions>(project, KotlinPlatformType.js, targetName, { KotlinJsOptionsImpl() }) val target = KotlinWithJavaTarget<KotlinJsOptions>(project, KotlinPlatformType.js, targetName, { KotlinJsOptionsImpl() })
(project.kotlinExtension as Kotlin2JsProjectExtension).target = target (project.kotlinExtension as Kotlin2JsProjectExtension).target = target
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+4
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.dsl.Coroutines import org.jetbrains.kotlin.gradle.dsl.Coroutines
import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind
import org.jetbrains.kotlin.gradle.plugin.Kotlin2JsPlugin.Companion.NOWARN_2JS_FLAG
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.Companion.jsCompilerProperty import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.Companion.jsCompilerProperty
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter
@@ -212,6 +213,9 @@ internal class PropertiesProvider private constructor(private val project: Proje
val jsGenerateExecutableDefault: Boolean val jsGenerateExecutableDefault: Boolean
get() = booleanProperty("kotlin.js.generate.executable.default") ?: true get() = booleanProperty("kotlin.js.generate.executable.default") ?: true
val noWarn2JsPlugin: Boolean
get() = booleanProperty(NOWARN_2JS_FLAG) ?: false
val stdlibDefaultDependency: Boolean val stdlibDefaultDependency: Boolean
get() = booleanProperty("kotlin.stdlib.default.dependency") ?: true get() = booleanProperty("kotlin.stdlib.default.dependency") ?: true