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

[Gradle, JS] Fix for Gradle 5.4

Browse Source 
#KT-38055 fixed
This commit is contained in:
Ilya Goncharov
2020-04-07 09:46:42 +03:00
parent 626e7d14ec
commit 33d4655053
2 changed files with 4 additions and 4 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/Kotlin2JsGradlePluginIT.kt
+2 -2
View File
@@ -81,13 +81,13 @@ class Kotlin2JsIrGradlePluginIT : AbstractKotlin2JsGradlePluginIT(true) {
val appProject = transformProjectWithPluginsDsl( val appProject = transformProjectWithPluginsDsl(
projectName = "app", projectName = "app",
directoryPrefix = rootProjectName, directoryPrefix = rootProjectName,
wrapperVersion = GradleVersionRequired.AtLeast("5.5") wrapperVersion = GradleVersionRequired.AtLeast("5.4")
) )
val libProject = transformProjectWithPluginsDsl( val libProject = transformProjectWithPluginsDsl(
projectName = "lib", projectName = "lib",
directoryPrefix = rootProjectName, directoryPrefix = rootProjectName,
wrapperVersion = GradleVersionRequired.AtLeast("5.5") wrapperVersion = GradleVersionRequired.AtLeast("5.4")
) )
libProject.gradleProperties().appendText(jsCompilerType(KotlinJsCompilerType.IR)) libProject.gradleProperties().appendText(jsCompilerType(KotlinJsCompilerType.IR))
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt
+2 -2
View File
@@ -88,8 +88,8 @@ constructor(
internal fun getIrBinaries( internal fun getIrBinaries(
type: KotlinJsBinaryType type: KotlinJsBinaryType
): DomainObjectSet<JsIrBinary> = ): DomainObjectSet<JsIrBinary> =
matching { it.type == type } withType(JsIrBinary::class.java)
.withType(JsIrBinary::class.java) .matching { it.type == type }
private fun <T : JsBinary> createBinaries( private fun <T : JsBinary> createBinaries(
compilation: KotlinJsCompilation, compilation: KotlinJsCompilation,