[Gradle] Remove tests for legacy multiplatform plugin
Stdlib is already migrated, kotlin-test is on the way. In Kotlin 2.0 this should be removed completely. ^KT-61816 ^KT-61106 Verification Pending
This commit is contained in:
Anton Lakotka
committed by
Space Team
Space Team
parent
91acabc286
commit
642c9e4261
-387
@@ -1,387 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2017 JetBrains s.r.o.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.jetbrains.kotlin.gradle
|
|
||||||
|
|
||||||
import com.intellij.testFramework.TestDataPath
|
|
||||||
import org.gradle.api.logging.LogLevel
|
|
||||||
import org.gradle.util.GradleVersion
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.EXPECTED_BY_CONFIG_NAME
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.IMPLEMENT_CONFIG_NAME
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.IMPLEMENT_DEPRECATION_WARNING
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
|
|
||||||
import org.jetbrains.kotlin.gradle.testbase.TestVersions
|
|
||||||
import org.jetbrains.kotlin.gradle.testbase.assertHasDiagnostic
|
|
||||||
import org.jetbrains.kotlin.gradle.testbase.assertNoDiagnostic
|
|
||||||
import org.jetbrains.kotlin.gradle.util.AGPVersion
|
|
||||||
import org.jetbrains.kotlin.gradle.util.getFileByName
|
|
||||||
import org.jetbrains.kotlin.gradle.util.modify
|
|
||||||
import org.jetbrains.kotlin.gradle.util.replaceText
|
|
||||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
|
||||||
import org.junit.Test
|
|
||||||
import java.io.File
|
|
||||||
import java.util.*
|
|
||||||
import kotlin.test.assertTrue
|
|
||||||
|
|
||||||
@TestDataPath("\$CONTENT_ROOT/resources")
|
|
||||||
class MultiplatformGradleIT : BaseGradleIT() {
|
|
||||||
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testMultiplatformCompile() {
|
|
||||||
val project = Project("multiplatformProject")
|
|
||||||
|
|
||||||
project.setupWorkingDir()
|
|
||||||
|
|
||||||
// remove the default suppression that was added for all other tests
|
|
||||||
project.projectDir.resolve("gradle.properties").replaceText("kotlin.internal.mpp12x.deprecation.suppress=true", "")
|
|
||||||
|
|
||||||
project.build("build") {
|
|
||||||
assertFailed()
|
|
||||||
|
|
||||||
assertHasDiagnostic(KotlinToolingDiagnostics.Kotlin12XMppDeprecation)
|
|
||||||
|
|
||||||
assertTasksNotExecuted(
|
|
||||||
":lib:compileKotlinCommon",
|
|
||||||
":lib:compileTestKotlinCommon",
|
|
||||||
":libJvm:compileKotlin",
|
|
||||||
":libJvm:compileTestKotlin",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
project.projectDir.resolve("gradle.properties").appendText("\nkotlin.internal.mpp12x.deprecation.suppress=true")
|
|
||||||
project.build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
|
|
||||||
assertNoDiagnostic(KotlinToolingDiagnostics.Kotlin12XMppDeprecation)
|
|
||||||
assertTasksExecuted(
|
|
||||||
":lib:compileKotlinCommon",
|
|
||||||
":lib:compileTestKotlinCommon",
|
|
||||||
":libJvm:compileKotlin",
|
|
||||||
":libJvm:compileTestKotlin",
|
|
||||||
)
|
|
||||||
assertFileExists("lib/build/classes/kotlin/main/foo/PlatformClass.kotlin_metadata")
|
|
||||||
assertFileExists("lib/build/classes/kotlin/test/foo/PlatformTest.kotlin_metadata")
|
|
||||||
assertFileExists("libJvm/build/classes/kotlin/main/foo/PlatformClass.class")
|
|
||||||
assertFileExists("libJvm/build/classes/kotlin/test/foo/PlatformTest.class")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testDeprecatedImplementWarning() {
|
|
||||||
val project = Project("multiplatformProject")
|
|
||||||
|
|
||||||
project.build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertNotContains(IMPLEMENT_DEPRECATION_WARNING)
|
|
||||||
}
|
|
||||||
|
|
||||||
project.projectDir.walk().filter { it.name == "build.gradle" }.forEach { buildGradle ->
|
|
||||||
buildGradle.modify { it.replace(EXPECTED_BY_CONFIG_NAME, IMPLEMENT_CONFIG_NAME) }
|
|
||||||
}
|
|
||||||
|
|
||||||
project.build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertContains(IMPLEMENT_DEPRECATION_WARNING)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testCommonKotlinOptions() {
|
|
||||||
with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
File(projectDir, "lib/build.gradle").appendText(
|
|
||||||
"\ncompileKotlinCommon.kotlinOptions.freeCompilerArgs = ['-Xno-inline']" +
|
|
||||||
"\ncompileKotlinCommon.kotlinOptions.suppressWarnings = true"
|
|
||||||
)
|
|
||||||
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertContains("-Xno-inline")
|
|
||||||
assertContains("-nowarn")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testSubprojectWithAnotherClassLoader() {
|
|
||||||
with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir(applyLanguageVersion = false)
|
|
||||||
|
|
||||||
// Make sure there is a plugin applied with the plugins DSL, so that Gradle loads the
|
|
||||||
// plugins separately for the subproject, with a different class loader:
|
|
||||||
File(projectDir, "libJvm/build.gradle").modify {
|
|
||||||
"plugins { id 'com.moowork.node' version '1.3.1' }" + "\n" + it
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove the root project buildscript dependency, needed for the same purpose:
|
|
||||||
File(projectDir, "build.gradle").modify {
|
|
||||||
it.replace("classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:\$kotlin_version\"", "")
|
|
||||||
.apply { assert(!equals(it)) }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Instead, add the dependencies directly to the subprojects buildscripts:
|
|
||||||
listOf("lib", "libJvm").forEach { subDirectory ->
|
|
||||||
File(projectDir, "$subDirectory/build.gradle").modify {
|
|
||||||
"""
|
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
maven { url = uri("https://plugins.gradle.org/m2/") }
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
""".trimIndent() + "\n" + it
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// todo: also make incremental compilation test
|
|
||||||
@Test
|
|
||||||
fun testIncrementalBuild(): Unit = Project("multiplatformProject").run {
|
|
||||||
val compileCommonTask = ":lib:compileKotlinCommon"
|
|
||||||
val compileJvmTask = ":libJvm:compileKotlin"
|
|
||||||
val allKotlinTasks = listOf(compileCommonTask, compileJvmTask)
|
|
||||||
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
}
|
|
||||||
|
|
||||||
val commonProjectDir = File(projectDir, "lib")
|
|
||||||
commonProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" }
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(allKotlinTasks)
|
|
||||||
}
|
|
||||||
|
|
||||||
val jvmProjectDir = File(projectDir, "libJvm")
|
|
||||||
jvmProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" }
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(compileJvmTask)
|
|
||||||
assertTasksUpToDate(compileCommonTask)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testMultipleCommonModules(): Unit = with(Project("multiplatformMultipleCommonModules")) {
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
|
|
||||||
val sourceSets = listOf("", "Test")
|
|
||||||
val commonTasks = listOf("libA", "libB").flatMap { module ->
|
|
||||||
sourceSets.map { sourceSet -> ":$module:compile${sourceSet}KotlinCommon" }
|
|
||||||
}
|
|
||||||
val platformTasks = listOf("libJvm" to "").flatMap { (module, platformSuffix) ->
|
|
||||||
sourceSets.map { sourceSet -> ":$module:compile${sourceSet}Kotlin$platformSuffix" }
|
|
||||||
}
|
|
||||||
assertTasksExecuted(commonTasks + platformTasks)
|
|
||||||
|
|
||||||
val expectedJvmMainClasses =
|
|
||||||
listOf("PlatformClassB", "PlatformClassA", "JavaLibUseKt", "CommonClassB", "CommonClassA").map { "foo/$it" }
|
|
||||||
val jvmMainClassesDir = File(projectDir, kotlinClassesDir(subproject = "libJvm"))
|
|
||||||
expectedJvmMainClasses.forEach { className ->
|
|
||||||
assertTrue(File(jvmMainClassesDir, className + ".class").isFile, "Class $className should be compiled for JVM.")
|
|
||||||
}
|
|
||||||
|
|
||||||
val expectedJvmTestClasses = listOf("PlatformTestB", "PlatformTestA", "CommonTestB", "CommonTestA").map { "foo/$it" }
|
|
||||||
val jvmTestClassesDir = File(projectDir, kotlinClassesDir(subproject = "libJvm", sourceSet = "test"))
|
|
||||||
expectedJvmTestClasses.forEach { className ->
|
|
||||||
assertTrue(File(jvmTestClassesDir, className + ".class").isFile, "Class $className should be compiled for JVM.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testFreeCompilerArgsAssignment(): Unit = with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
val overrideCompilerArgs = "kotlinOptions.freeCompilerArgs = ['-verbose']"
|
|
||||||
|
|
||||||
gradleBuildScript("lib").appendText("\ncompileKotlinCommon.$overrideCompilerArgs")
|
|
||||||
gradleBuildScript("libJvm").appendText("\ncompileKotlin.$overrideCompilerArgs")
|
|
||||||
|
|
||||||
build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(":lib:compileKotlinCommon", ":libJvm:compileKotlin")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testCommonModuleAsTransitiveDependency() = with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
gradleBuildScript("libJvm").appendText(
|
|
||||||
"""
|
|
||||||
${'\n'}
|
|
||||||
tasks.register("printCompileConfiguration", DefaultTask) {
|
|
||||||
doFirst {
|
|
||||||
configurations.getByName("api").dependencies.each {
|
|
||||||
println("Dependency: '" + it.name + "'")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
build("printCompileConfiguration") {
|
|
||||||
assertSuccessful()
|
|
||||||
// Check that `lib` is contained in the resolved compile artifacts of `libJvm`:
|
|
||||||
assertContains("Dependency: 'lib'")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testArchivesBaseNameAsCommonModuleName() = with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
val moduleName = "my_module_name"
|
|
||||||
|
|
||||||
gradleBuildScript("lib").appendText("\narchivesBaseName = '$moduleName'")
|
|
||||||
|
|
||||||
build("compileKotlinCommon") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertFileExists(kotlinClassesDir(subproject = "lib") + "META-INF/$moduleName.kotlin_module")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testKt23092() = with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
val successMarker = "Found JavaCompile task:"
|
|
||||||
|
|
||||||
gradleBuildScript("lib").appendText(
|
|
||||||
"\n" + """
|
|
||||||
afterEvaluate {
|
|
||||||
println('$successMarker ' + tasks.getByName('compileJava').path)
|
|
||||||
println('$successMarker ' + tasks.getByName('compileTestJava').path)
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
build(":lib:tasks") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertContains("$successMarker :lib:compileJava")
|
|
||||||
assertContains("$successMarker :lib:compileTestJava")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testCustomSourceSets() = with(Project("multiplatformProject")) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
val sourceSetName = "foo"
|
|
||||||
val sourceSetDeclaration = "\nsourceSets { $sourceSetName { } }"
|
|
||||||
|
|
||||||
listOf("lib", "libJvm").forEach { module ->
|
|
||||||
gradleBuildScript(module).appendText(sourceSetDeclaration)
|
|
||||||
}
|
|
||||||
|
|
||||||
listOf(
|
|
||||||
"expect fun foo(): String" to "lib/src/$sourceSetName/kotlin",
|
|
||||||
"actual fun foo(): String = \"jvm\"" to "libJvm/src/$sourceSetName/kotlin",
|
|
||||||
).forEach { (code, path) ->
|
|
||||||
File(projectDir, path).run {
|
|
||||||
mkdirs()
|
|
||||||
File(this, "Foo.kt").writeText(code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val customSourceSetCompileTasks = listOf(":lib" to "Common", ":libJvm" to "")
|
|
||||||
.map { (module, platform) -> "$module:compile${sourceSetName.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}Kotlin$platform" }
|
|
||||||
|
|
||||||
build(*customSourceSetCompileTasks.toTypedArray()) {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(customSourceSetCompileTasks)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testWithJavaDuplicatedResourcesFail() = with(
|
|
||||||
Project(
|
|
||||||
projectName = "mpp-single-jvm-target",
|
|
||||||
gradleVersionRequirement = GradleVersionRequired.AtLeast(TestVersions.Gradle.G_7_0),
|
|
||||||
minLogLevel = LogLevel.WARN
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
setupWorkingDir()
|
|
||||||
|
|
||||||
gradleBuildScript().modify { buildFileContent ->
|
|
||||||
buildFileContent
|
|
||||||
.lines()
|
|
||||||
.joinToString(separator = "\n") {
|
|
||||||
if (it.contains("jvm()")) {
|
|
||||||
"jvm { withJava() }"
|
|
||||||
} else {
|
|
||||||
it
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val resDir = projectDir.resolve("src/jvmMain/resources").also { it.mkdirs() }
|
|
||||||
resDir.resolve("test.properties").writeText(
|
|
||||||
"""
|
|
||||||
one=true
|
|
||||||
two=false
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
build("assemble") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertNotContains("no duplicate handling strategy has been set")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testKtKt35942InternalsFromMainInTestViaTransitiveDeps() = with(Project("kt-35942-jvm", GradleVersionRequired.FOR_MPP_SUPPORT)) {
|
|
||||||
build(":lib1:compileTestKotlin") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(":lib1:compileKotlin", ":lib2:jar")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testKtKt35942InternalsFromMainInTestViaTransitiveDepsAndroid() = with(
|
|
||||||
Project(
|
|
||||||
projectName = "kt-35942-android",
|
|
||||||
// Should be checked with the latest AGP /Gradle once will be migrated to the new test DSL
|
|
||||||
gradleVersionRequirement = GradleVersionRequired.Until(TestVersions.Gradle.G_7_6)
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
|
|
||||||
build(
|
|
||||||
":lib1:compileDebugUnitTestKotlin",
|
|
||||||
options = defaultBuildOptions().copy(
|
|
||||||
androidGradlePluginVersion = AGPVersion.v4_2_0,
|
|
||||||
androidHome = KtTestUtil.findAndroidSdk().also { acceptAndroidSdkLicenses(it) },
|
|
||||||
).suppressDeprecationWarningsOn(
|
|
||||||
"AGP uses deprecated IncrementalTaskInputs (Gradle 7.5); relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty (Gradle 7.4)"
|
|
||||||
) { options ->
|
|
||||||
GradleVersion.version(currentGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_5) && options.safeAndroidGradlePluginVersion < AGPVersion.v7_3_0
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTasksExecuted(":lib1:compileDebugKotlin")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-72
@@ -170,78 +170,6 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testKtAppResolvesOldMpp() {
|
|
||||||
val outerProject = Project("multiplatformProject")
|
|
||||||
val innerJvmProject = Project("simpleProject")
|
|
||||||
|
|
||||||
with(outerProject) {
|
|
||||||
embedProject(innerJvmProject)
|
|
||||||
|
|
||||||
listOf(innerJvmProject to ":libJvm").forEach { (project, dependency) ->
|
|
||||||
gradleBuildScript(project.projectName).appendText(
|
|
||||||
"\n" + """
|
|
||||||
dependencies {
|
|
||||||
implementation project('$dependency')
|
|
||||||
implementation project(':lib')
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
testResolveAllConfigurations(project.projectName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testResolvesOldKotlinArtifactsPublishedWithMetadata() = with(Project("multiplatformProject", gradleVersion)) {
|
|
||||||
setupWorkingDir()
|
|
||||||
gradleBuildScript().appendText(
|
|
||||||
"\n" + """
|
|
||||||
configure([project(':lib'), project(':libJvm')]) {
|
|
||||||
group 'com.example.oldmpp'
|
|
||||||
version '1.0'
|
|
||||||
apply plugin: 'maven-publish'
|
|
||||||
afterEvaluate {
|
|
||||||
publishing {
|
|
||||||
repositories { maven { url "file://${'$'}{rootDir.absolutePath.replace('\\', '/')}/repo" } }
|
|
||||||
publications { kotlin(MavenPublication) { from(components.java) } }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
build("publish") { assertSuccessful() }
|
|
||||||
|
|
||||||
gradleBuildScript().modify {
|
|
||||||
it.replace("'com.example.oldmpp'", "'com.example.consumer'") +
|
|
||||||
"\nsubprojects { repositories { maven { url \"file://${'$'}{rootDir.absolutePath.replace('\\\\', '/')}/repo\" } } }"
|
|
||||||
}
|
|
||||||
|
|
||||||
gradleBuildScript("lib").appendText("\ndependencies { implementation 'com.example.oldmpp:lib:1.0' }")
|
|
||||||
testResolveAllConfigurations("lib")
|
|
||||||
|
|
||||||
gradleBuildScript("libJvm").appendText("\ndependencies { implementation 'com.example.oldmpp:libJvm:1.0' }")
|
|
||||||
testResolveAllConfigurations("libJvm")
|
|
||||||
|
|
||||||
embedProject(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app"))
|
|
||||||
gradleBuildScript("sample-lib").appendText(
|
|
||||||
"\n" + """
|
|
||||||
dependencies {
|
|
||||||
commonMainApi 'com.example.oldmpp:lib:1.0'
|
|
||||||
jvm6MainApi 'com.example.oldmpp:libJvm:1.0'
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
|
|
||||||
build(
|
|
||||||
"assemble",
|
|
||||||
projectDir = File(workingDir, "sample-lib"),
|
|
||||||
) {
|
|
||||||
assertSuccessful()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testJvmWithJavaProjectCanBeResolvedInAllConfigurations() =
|
fun testJvmWithJavaProjectCanBeResolvedInAllConfigurations() =
|
||||||
with(Project("new-mpp-jvm-with-java-multi-module", GradleVersionRequired.FOR_MPP_SUPPORT)) {
|
with(Project("new-mpp-jvm-with-java-multi-module", GradleVersionRequired.FOR_MPP_SUPPORT)) {
|
||||||
|
|||||||
-17
@@ -1,17 +0,0 @@
|
|||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
kotlin.internal.mpp12x.deprecation.suppress=true
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
apply plugin: 'kotlin-platform-common'
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
expect class PlatformClass {
|
|
||||||
val value: String
|
|
||||||
}
|
|
||||||
|
|
||||||
class CommonClass
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
expect class PlatformTest {
|
|
||||||
val value: PlatformClass
|
|
||||||
}
|
|
||||||
|
|
||||||
class CommonTest(val commonClass: CommonClass)
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
apply plugin: 'kotlin-platform-jvm'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
expectedBy project(":lib")
|
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
|
||||||
implementation 'com.google.guava:guava:20.0'
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformClass {
|
|
||||||
actual val value: String = "JVM"
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet
|
|
||||||
|
|
||||||
fun main(args: Array<String>) {
|
|
||||||
val colors = ImmutableSet.of("red", "orange", "yellow")
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package foo
|
|
||||||
|
|
||||||
actual class PlatformTest {
|
|
||||||
actual val value: PlatformClass = PlatformClass()
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
include ':lib', ':libJvm'
|
|
||||||
Reference in New Issue
Block a user