[Gradle, JS] Add disambiguation classifier for MPP
This commit is contained in:
+11
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTargetConfigurator
|
|||||||
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset
|
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetConfigurator
|
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetConfigurator
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
|
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
|
||||||
|
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
|
||||||
|
|
||||||
open class KotlinJsTargetPreset(
|
open class KotlinJsTargetPreset(
|
||||||
project: Project,
|
project: Project,
|
||||||
@@ -40,6 +41,16 @@ open class KotlinJsTargetPreset(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? =
|
||||||
|
if (irPreset == null) {
|
||||||
|
super.provideTargetDisambiguationClassifier(target)
|
||||||
|
} else {
|
||||||
|
lowerCamelCaseName(
|
||||||
|
LEGACY_DISAMBIGUATION_CLASSIFIER,
|
||||||
|
super.provideTargetDisambiguationClassifier(target)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator(
|
override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator(
|
||||||
kotlinPluginVersion,
|
kotlinPluginVersion,
|
||||||
irPreset?.let { KotlinJsIrTargetConfigurator(kotlinPluginVersion) }
|
irPreset?.let { KotlinJsIrTargetConfigurator(kotlinPluginVersion) }
|
||||||
|
|||||||
+3
@@ -26,6 +26,9 @@ open class KotlinJsIrTargetPreset(
|
|||||||
return project.objects.newInstance(KotlinJsIrTarget::class.java, project, platformType)
|
return project.objects.newInstance(KotlinJsIrTarget::class.java, project, platformType)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO Remove when IR and Legacy targets swap
|
||||||
|
override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsIrCompilation>): String? = "js"
|
||||||
|
|
||||||
override fun createKotlinTargetConfigurator(): KotlinOnlyTargetConfigurator<KotlinJsIrCompilation, KotlinJsIrTarget> =
|
override fun createKotlinTargetConfigurator(): KotlinOnlyTargetConfigurator<KotlinJsIrCompilation, KotlinJsIrTarget> =
|
||||||
KotlinJsIrTargetConfigurator(kotlinPluginVersion)
|
KotlinJsIrTargetConfigurator(kotlinPluginVersion)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user