[JS] Warning for dukat using
This commit is contained in:
committed by
Space Team
parent
3a9e92b577
commit
810bc57d16
+2
-5
@@ -373,11 +373,8 @@ internal class PropertiesProvider private constructor(private val project: Proje
|
|||||||
val ignoreTcsmOverflow: Boolean
|
val ignoreTcsmOverflow: Boolean
|
||||||
get() = booleanProperty(IGNORE_TCSM_OVERFLOW) ?: false
|
get() = booleanProperty(IGNORE_TCSM_OVERFLOW) ?: false
|
||||||
|
|
||||||
/**
|
val errorJsGenerateExternals: Boolean?
|
||||||
* Automaticaly discover external .d.ts declarations
|
get() = booleanProperty("kotlin.js.generate.externals")
|
||||||
*/
|
|
||||||
val jsDiscoverTypes: Boolean?
|
|
||||||
get() = booleanProperty("kotlin.js.experimental.discoverTypes")
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use Kotlin/JS backend compiler type
|
* Use Kotlin/JS backend compiler type
|
||||||
|
|||||||
+16
-6
@@ -31,8 +31,10 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat
|
|||||||
check(rootProject.rootProject == rootProject)
|
check(rootProject.rootProject == rootProject)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val logger = rootProject.logger
|
||||||
|
|
||||||
private val gradleHome = rootProject.gradle.gradleUserHomeDir.also {
|
private val gradleHome = rootProject.gradle.gradleUserHomeDir.also {
|
||||||
rootProject.logger.kotlinInfo("Storing cached files in $it")
|
logger.kotlinInfo("Storing cached files in $it")
|
||||||
}
|
}
|
||||||
|
|
||||||
var installationDir by Property(gradleHome.resolve("nodejs"))
|
var installationDir by Property(gradleHome.resolve("nodejs"))
|
||||||
@@ -49,13 +51,21 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat
|
|||||||
@Transient
|
@Transient
|
||||||
private val projectProperties = PropertiesProvider(rootProject)
|
private val projectProperties = PropertiesProvider(rootProject)
|
||||||
|
|
||||||
inner class Experimental {
|
private val errorGenerateExternals = run {
|
||||||
val discoverTypes: Boolean
|
if (projectProperties.errorJsGenerateExternals != null) {
|
||||||
get() = projectProperties.jsDiscoverTypes == true
|
logger.warn(
|
||||||
|
"""
|
||||||
|
|
|
||||||
|
|==========
|
||||||
|
|Please note, Dukat integration in Gradle plugin does not work now, it was removed.
|
||||||
|
|We rethink how we can integrate properly.
|
||||||
|
|==========
|
||||||
|
|
|
||||||
|
""".trimMargin()
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val experimental = Experimental()
|
|
||||||
|
|
||||||
val taskRequirements: TasksRequirements = TasksRequirements()
|
val taskRequirements: TasksRequirements = TasksRequirements()
|
||||||
|
|
||||||
val nodeJsSetupTaskProvider: TaskProvider<out NodeJsSetupTask>
|
val nodeJsSetupTaskProvider: TaskProvider<out NodeJsSetupTask>
|
||||||
|
|||||||
-1
@@ -398,7 +398,6 @@ internal class KotlinCompilationNpmResolver(
|
|||||||
) : Serializable {
|
) : Serializable {
|
||||||
private val projectPackagesDir by lazy { compilationResolver.nodeJs_.projectPackagesDir }
|
private val projectPackagesDir by lazy { compilationResolver.nodeJs_.projectPackagesDir }
|
||||||
private val rootDir by lazy { compilationResolver.nodeJs_.rootProject.rootDir }
|
private val rootDir by lazy { compilationResolver.nodeJs_.rootProject.rootDir }
|
||||||
private val dukatPackageVersion by lazy { compilationResolver.nodeJs_.versions.dukat }
|
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
internal lateinit var compilationResolver: KotlinCompilationNpmResolver
|
internal lateinit var compilationResolver: KotlinCompilationNpmResolver
|
||||||
|
|||||||
Reference in New Issue
Block a user