Skip to content

Commit e705a36

Browse files
TapchicomaSpace
Tapchicoma
authored and
Space
committed
Apply default pluginManagement in settings for old test setup.
Cleanup non-required configuration in test projects settings. ^KT-45745 In Progress
1 parent 01332a2 commit e705a36

File tree

135 files changed

+35
-1186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+35
-1186
lines changed

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.model.ModelContainer
1919
import org.jetbrains.kotlin.gradle.model.ModelFetcherBuildAction
2020
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
2121
import org.jetbrains.kotlin.gradle.testbase.enableCacheRedirector
22+
import org.jetbrains.kotlin.gradle.testbase.addPluginManagementToSettings
2223
import org.jetbrains.kotlin.gradle.util.*
2324
import org.jetbrains.kotlin.test.RunnerWithMuteInDatabase
2425
import org.jetbrains.kotlin.test.util.trimTrailingWhitespaces
@@ -292,7 +293,10 @@ abstract class BaseGradleIT {
292293
addHeapDumpOptionsToPropertiesFile()
293294
}
294295

295-
if (enableCacheRedirector) projectDir.toPath().enableCacheRedirector()
296+
projectDir.toPath().apply {
297+
addPluginManagementToSettings()
298+
if (enableCacheRedirector) enableCacheRedirector()
299+
}
296300
}
297301
}
298302

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ open class Kapt3IT : Kapt3BaseIT() {
689689

690690
val kaptProject = Project("simple", directoryPrefix = "kapt2").apply { setupWorkingDir(false) }
691691
kaptProject.projectDir.copyRecursively(projectDir.resolve("simple"))
692-
projectDir.resolve("settings.gradle").appendText("include 'simple'")
692+
projectDir.resolve("settings.gradle").appendText("\ninclude ':simple'")
693693
gradleBuildScript().appendText("\ndependencies { implementation project(':simple') }")
694694

695695
testResolveAllConfigurations()

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,13 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
1818
import org.jetbrains.kotlin.gradle.targets.js.npm.fromSrcPackageJson
1919
import org.jetbrains.kotlin.gradle.tasks.USING_JS_INCREMENTAL_COMPILATION_MESSAGE
2020
import org.jetbrains.kotlin.gradle.tasks.USING_JS_IR_BACKEND_MESSAGE
21-
import org.jetbrains.kotlin.gradle.testbase.GradleTest
22-
import org.jetbrains.kotlin.gradle.testbase.assertFileExists
23-
import org.jetbrains.kotlin.gradle.testbase.build
24-
import org.jetbrains.kotlin.gradle.testbase.project
2521
import org.jetbrains.kotlin.gradle.util.*
2622
import org.junit.Assert
2723
import org.junit.Assume.assumeFalse
2824
import org.junit.Test
29-
import org.junit.jupiter.api.DisplayName
3025
import java.io.File
3126
import java.io.FileFilter
3227
import java.util.zip.ZipFile
33-
import kotlin.io.path.readText
3428
import kotlin.test.assertEquals
3529
import kotlin.test.assertFalse
3630
import kotlin.test.assertTrue
@@ -535,7 +529,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(val irBackend: Boolean) : BaseGra
535529
assumeFalse(irBackend) // TODO: Support IR version of kotlinx.html
536530
setupWorkingDir()
537531
gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
538-
gradleSettingsScript().modify(::transformBuildScriptWithPluginsDsl)
539532

540533
build("publish", "runDceKotlin", "test", "runDceBenchmarkKotlin") {
541534
assertSuccessful()

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
2424
id "org.jetbrains.kotlin.android" version "${'$'}kotlin_version"
2525
id "org.jetbrains.kotlin.js" version "${'$'}kotlin_version"
2626
id "org.jetbrains.kotlin.multiplatform" version "${'$'}kotlin_version"
27+
id "org.jetbrains.kotlin.multiplatform.pm20" version "${'$'}kotlin_version"
28+
id "org.jetbrains.kotlin.plugin.allopen" version "${'$'}kotlin_version"
2729
id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}kotlin_version"
2830
}
2931
@@ -44,6 +46,8 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
4446
case "kotlin-dce-js":
4547
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
4648
break
49+
case "kotlin2js":
50+
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
4751
}
4852
}
4953
}
@@ -69,6 +73,8 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
6973
id("org.jetbrains.kotlin.android") version kotlin_version
7074
id("org.jetbrains.kotlin.js") version kotlin_version
7175
id("org.jetbrains.kotlin.multiplatform") version kotlin_version
76+
id("org.jetbrains.kotlin.multiplatform.pm20") version kotlin_version
77+
id("org.jetbrains.kotlin.plugin.allopen") version kotlin_version
7278
id("org.jetbrains.kotlin.test.fixes.android") version kotlin_version
7379
}
7480
@@ -84,7 +90,8 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
8490
"com.android.lint",
8591
"com.android.instantapp",
8692
"com.android.feature" -> useModule("com.android.tools.build:gradle:${'$'}android_tools_version")
87-
"kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
93+
"kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
94+
"kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
8895
}
8996
}
9097
}

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/settings.gradle‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
pluginManagement {
2-
repositories {
3-
mavenLocal()
4-
mavenCentral()
5-
google()
6-
gradlePluginPortal()
7-
}
8-
9-
plugins {
10-
id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
11-
id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
12-
id "org.jetbrains.kotlin.android" version "$kotlin_version"
13-
}
14-
15-
resolutionStrategy {
16-
eachPlugin {
17-
if (requested.id.id.startsWith("com.android.")) {
18-
useModule("com.android.tools.build:gradle:$android_tools_version")
19-
}
20-
}
21-
}
22-
}
23-
241
include ':Android', ':Lib', ':Test'

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
pluginManagement {
2-
repositories {
3-
gradlePluginPortal()
4-
mavenCentral()
5-
mavenLocal()
6-
}
7-
val kotlin_version: String by settings
8-
plugins {
9-
kotlin("multiplatform").version(kotlin_version)
10-
}
11-
}
12-
13-
include(":shared")
1+
include(":shared")

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/associatedDependencies/settings.gradle‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
11
rootProject.name = "sample-app"
2-
3-
enableFeaturePreview("GRADLE_METADATA")
4-
5-
pluginManagement {
6-
repositories {
7-
mavenLocal()
8-
mavenCentral()
9-
gradlePluginPortal()
10-
}
11-
}

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/settings.gradle‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)