diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt index 490515b39f9..f976ddf2016 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt @@ -537,7 +537,6 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-27170: android lint works with dependency on non-android mpp project") @GradleAndroidTest - @Disabled // not fully migrated yet fun testLintInAndroidProjectsDependingOnMppWithoutAndroid( gradleVersion: GradleVersion, agpVersion: String, @@ -549,8 +548,8 @@ class KotlinAndroidMppIT : KGPBaseTest() { buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), buildJdk = jdkVersion.location ) { -// embedProject(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) // TODO - subProject("lib").buildGradle.appendText( + includeOtherProjectAsSubmodule(pathPrefix = "new-mpp-lib-and-app", otherProjectName = "sample-lib") + subProject("Lib").buildGradle.appendText( //language=Gradle """ diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt index 7e6123e0a51..5de4511aada 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt @@ -24,9 +24,9 @@ import kotlin.io.path.* import kotlin.test.assertTrue /** - * Create new test project. + * Create a new test project. * - * @param [projectName] test project name in 'src/test/resources/testProject` directory. + * @param [projectName] test project name in `src/test/resources/testProject` directory. * @param [buildOptions] common Gradle build options * @param [buildJdk] path to JDK build should run with. *Note* Only append to 'gradle.properties'! */ @@ -83,7 +83,7 @@ fun KGPBaseTest.project( } /** - * Create new test project with configuring single native target. + * Create a new test project with configuring single native target. * * @param [projectName] test project name in 'src/test/resources/testProject` directory. * @param [buildOptions] common Gradle build options