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

Fixup the tests vs master-gradle-plugin

Browse Source 
Defined 4.0 and 1.3.0 as default versions of Gradle and plugin for PluginTargetVersions
Use `{{kotlin_plugin_repositories}}` template in testData of ImportTests
Update "mute" databases for new tests

Add `kotlin.stdlib.default.dependency=false` to some testData
This commit is contained in:
Alexander Dudinsky
2020-07-09 12:03:26 +03:00
parent 005314ce06
commit d89083cd8c
40 changed files with 131 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt
+6 -3
View File
@@ -10,6 +10,7 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.NativePlatforms
@@ -18,6 +19,8 @@ import org.junit.After
import org.junit.Before
import org.junit.Test
const val hmppGradlePluginVersion = "1.3.50+"
class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Before
@@ -36,7 +39,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportHMPPFlag() {
configureByFiles()
importProject()
@@ -51,7 +54,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportIntermediateModules() {
configureByFiles()
importProject()
@@ -225,7 +228,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJvmWithJavaOnHMPP() {
configureByFiles()
importProject()
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+3 -2
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
@@ -13,13 +14,13 @@ import org.junit.Test
class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() {
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testMultiplatformLibrary() {
importAndCheckHighlighting()
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testUnresolvedInMultiplatformLibrary() {
importAndCheckHighlighting(false, false)
}
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
+1
View File
@@ -10,6 +10,7 @@ import com.intellij.psi.*
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.testFramework.runInEdtAndGet
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
+4 -4
View File
@@ -9,14 +9,12 @@ import com.intellij.openapi.roots.DependencyScope
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
override fun isApplicableTest(): Boolean {
return !gradleVersion.startsWith("3")
}
fun importProject(modulePerSourceSet: Boolean) {
currentExternalProjectSettings.isResolveModulePerSourceSet = modulePerSourceSet
val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
@@ -29,6 +27,7 @@ class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testModulePerSourceSet() {
// Disable testing import module per source set test in Android Studio as this mode is not supported in Android Studio
if (isAndroidStudio()) {
@@ -61,6 +60,7 @@ class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testModulePerSourceSetDisabled() {
configureByFiles()
importProject(false)
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+18 -4
View File
@@ -25,9 +25,11 @@ import com.intellij.util.PathUtil
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.facetSettings
import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.util.rootManager
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@@ -53,6 +55,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonDependency() {
val files = configureByFiles()
importProject()
@@ -73,6 +76,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonExpectedByDependency() {
configureByFiles()
importProject()
@@ -87,6 +91,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonDependencyRoot() {
configureByFiles()
importProject()
@@ -97,6 +102,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testMultiProject() {
configureByFiles()
importProject()
@@ -111,6 +117,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testDependenciesReachableViaImpl() {
configureByFiles()
importProject()
@@ -127,6 +134,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplement() {
configureByFiles()
@@ -175,6 +183,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplementWithNonDefaultConfig() {
configureByFiles()
@@ -189,8 +198,8 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
assertNoModuleDepForModule("project3_main", "project1_main")
TestCase.assertEquals(
listOf("jar:///project2/build/libs/project2-jar.jar!/"),
getDependencyLibraryUrls("project3_main")
listOf("jar:///project2/build/libs/project2-jar.jar!/"),
getDependencyLibraryUrls("project3_main")
)
currentExternalProjectSettings.isResolveModulePerSourceSet = false
@@ -210,8 +219,8 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
assertModuleModuleDepScope("project3", "project1", DependencyScope.COMPILE)
TestCase.assertEquals(
emptyList<String>(),
getDependencyLibraryUrls("project3")
emptyList<String>(),
getDependencyLibraryUrls("project3")
)
} finally {
currentExternalProjectSettings.isResolveModulePerSourceSet = isResolveModulePerSourceSet
@@ -219,6 +228,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplementWithAndroid() {
configureByFiles()
@@ -249,6 +259,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun simpleAndroidAppWithCommonModule() {
configureByFiles()
@@ -277,6 +288,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsTestOutputFile() {
configureByFiles()
@@ -293,6 +305,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsProductionOutputFile() {
configureByFiles()
importProject()
@@ -308,6 +321,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
}
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsTestOutputFileInProjectWithAndroid() {
configureByFiles()
createProjectSubFile(
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
+4 -7
View File
@@ -9,21 +9,17 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.roots.*
import com.intellij.openapi.roots.impl.ModulesOrderEnumerator
import com.intellij.util.text.VersionComparatorUtil
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.util.sourceRoots
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
import java.io.File
class NewMultiplatformKaptProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
override fun isApplicableTest(): Boolean {
val isOldGradlePlugin = gradleKotlinPluginVersion != MINIMAL_SUPPORTED_VERSION
&& VersionComparatorUtil.compare(gradleKotlinPluginVersion, "1.3.40") < 0
return !isOldGradlePlugin && VersionComparatorUtil.compare(gradleVersion, "4.0") >= 0
}
@Test
@PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testKaptPaths() {
configureByFiles()
importProject()
@@ -76,6 +72,7 @@ class NewMultiplatformKaptProjectImportingTest : MultiplePluginVersionGradleImpo
}
@Test
@PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testRuntimeClasspath() {
configureByFiles()
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
+14 -15
View File
@@ -11,6 +11,7 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.js.JsPlatforms
@@ -21,8 +22,6 @@ import org.junit.After
import org.junit.Before
import org.junit.Test
const val mppImportTestMinVersionForMaster = "6.0+"
class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Before
@@ -41,7 +40,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testProjectDependency() {
configureByFiles()
importProject()
@@ -238,7 +237,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testUnresolvedDependency() {
configureByFiles()
importProject()
@@ -404,7 +403,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportTestsAndTargets() {
configureByFiles()
importProject()
@@ -488,7 +487,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testDependencyOnRoot() {
configureByFiles()
importProject()
@@ -533,7 +532,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testNestedDependencies() {
configureByFiles()
importProject()
@@ -638,7 +637,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
* dependencies in multiplatform project included in composite build
*/
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testPlatformToCommonExpByInComposite() {
configureByFiles()
importProject(true)
@@ -678,7 +677,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
* Test case for issue https://youtrack.jetbrains.com/issue/KT-29757
*/
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJavaTransitiveOnMPP() {
configureByFiles()
importProject(true)
@@ -740,7 +739,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
* Test case for issue https://youtrack.jetbrains.com/issue/KT-28822
*/
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.41+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.41+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportBeforeBuild() {
configureByFiles()
importProject(true)
@@ -803,7 +802,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testProductionOnTestFlag() {
configureByFiles()
importProject(true)
@@ -816,7 +815,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJvmWithJava() {
configureByFiles()
importProject(true)
@@ -869,7 +868,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testCommonTestTargetPlatform() {
configureByFiles()
importProject(true)
@@ -891,7 +890,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
}
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.60+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.60+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testIgnoreIncompatibleNativeTestTasks() {
configureByFiles()
importProject()
@@ -946,7 +945,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
@Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
@PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testMutableArtifactLists() {
configureByFiles()
importProject(true)
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
+3 -5
View File
@@ -5,19 +5,17 @@
package org.jetbrains.kotlin.gradle
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.roots.*
import com.intellij.openapi.roots.impl.ModulesOrderEnumerator
import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class PackagePrefixImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Test
@PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPackagePrefixNonMPP() {
configureByFiles()
importProject()
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
+14 -7
View File
@@ -16,6 +16,9 @@ import org.junit.runners.Parameterized
import java.io.File
import java.util.*
const val mppImportTestMinVersionForMaster = "6.0+"
const val legacyMppImportTestMinVersionForMaster = "5.3+"
abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTestCase() {
@Rule
@JvmField
@@ -53,16 +56,16 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes
)
private fun readPluginVersion() =
File("libraries/tools/kotlin-gradle-plugin/build/libs").listFiles()?.map { it.name }?.firstOrNull { it.contains("-original.jar") }?.replace(
"kotlin-gradle-plugin-",
""
)?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT"
File("libraries/tools/kotlin-gradle-plugin/build/libs").listFiles()?.map { it.name }
?.firstOrNull { it.contains("-original.jar") }?.replace(
"kotlin-gradle-plugin-",
""
)?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT"
@JvmStatic
@Parameterized.Parameters(name = "{index}: Gradle-{0}, KotlinGradlePlugin-{1}")
fun data(): Collection<Array<Any>> {
//TODO(auskov): remove extending list of gradle versions when tested version are advanced
return (AbstractModelBuilderTest.SUPPORTED_GRADLE_VERSIONS + arrayOf("6.5")).flatMap { gradleVersion ->
return (AbstractModelBuilderTest.SUPPORTED_GRADLE_VERSIONS).flatMap { gradleVersion ->
KOTLIN_GRADLE_PLUGIN_VERSIONS.map { kotlinVersion ->
arrayOf<Any>(
gradleVersion[0],
@@ -74,9 +77,13 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes
}
fun repositories(useKts: Boolean): String {
val customRepositories = arrayOf("https://dl.bintray.com/kotlin/kotlin-dev", "http://dl.bintray.com/kotlin/kotlin-eap")
val customRepositories = arrayOf(
"https://dl.bintray.com/kotlin/kotlin-dev",
"http://dl.bintray.com/kotlin/kotlin-eap"
)
val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n")
return """
mavenCentral()
mavenLocal()
google()
jcenter()
idea/idea-gradle/tests/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java
+2 -2
View File
@@ -12,9 +12,9 @@ import java.lang.annotation.*;
@Target({ElementType.TYPE, ElementType.METHOD})
public @interface PluginTargetVersions {
String gradleVersion() default "";
String gradleVersion() default "4.0+";
String pluginVersion() default "";
String pluginVersion() default "1.3.0+";
String gradleVersionForLatestPlugin() default "";
}
idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
Vendored
+6
View File
@@ -1,3 +1,9 @@
pluginManagement {
repositories {
{{kotlin_plugin_repositories}}
}
}
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
Vendored
+6
View File
@@ -1,3 +1,9 @@
pluginManagement {
repositories {
{{kotlin_plugin_repositories}}
}
}
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
google()
jcenter()
{{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
idea/testData/gradle/kaptImportingTest/modulePerSourceSet/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
google()
jcenter()
{{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/multiProject/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/multiProject/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplement/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplement/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
{{kotlin_plugin_repositories}}
}
dependencies {
idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/gradle.properties
Vendored
+1
View File
@@ -0,0 +1 @@
kotlin.stdlib.default.dependency=false
idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
{{kotlin_plugin_repositories}}
}
dependencies {