mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-03-10 08:31:29 +00:00
Update gradle plugin version in GradleFacetImportTest
Also drop legacy tests for 1_1_2
This commit is contained in:
@@ -56,7 +56,6 @@ import org.jetbrains.kotlin.platform.isCommon
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
|
||||
import org.junit.*
|
||||
import java.util.*
|
||||
|
||||
internal fun GradleImportingTestCase.facetSettings(moduleName: String) = KotlinFacet.get(getModule(moduleName))!!.configuration.settings
|
||||
|
||||
@@ -72,7 +71,6 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
|
||||
}
|
||||
}
|
||||
|
||||
//ToDo: Remove @TargetVersions("4.7 <=> 6.0") after updating plugin versions in testData
|
||||
class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
private fun assertSameKotlinSdks(vararg moduleNames: String) {
|
||||
@@ -83,32 +81,31 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(testFacetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -142,73 +139,27 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImport_1_1_2() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(testFacetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/main/java" to JavaSourceRootType.SOURCE,
|
||||
"file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
|
||||
"file:///src/main/resources" to JavaResourceRootType.RESOURCE
|
||||
),
|
||||
getSourceRootInfos("project_main")
|
||||
)
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
|
||||
"file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
|
||||
"file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
|
||||
),
|
||||
getSourceRootInfos("project_test")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportWithCustomSourceSets() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings("project_myMain")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(facetSettings("project_myTest")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -234,52 +185,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportWithCustomSourceSets_1_1_2() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings("project_myMain")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(facetSettings("project_myTest")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/main/java" to JavaSourceRootType.SOURCE,
|
||||
"file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
|
||||
"file:///src/main/resources" to JavaResourceRootType.RESOURCE
|
||||
),
|
||||
getSourceRootInfos("project_main")
|
||||
)
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
|
||||
"file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
|
||||
"file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE
|
||||
),
|
||||
getSourceRootInfos("project_test")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCoroutineImportByOptions() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -290,7 +195,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCoroutineImportByProperties() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -460,14 +364,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportByPlatformPlugin() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
}
|
||||
|
||||
@@ -556,14 +459,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportByKotlinPlugin() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
}
|
||||
|
||||
@@ -613,14 +515,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testArgumentEscaping() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals(
|
||||
listOf("-Xbuild-file=module with spaces"),
|
||||
listOf("-Xallow-no-source-files", "-Xbuild-file=module with spaces"),
|
||||
compilerSettings!!.additionalArgumentsAsList
|
||||
)
|
||||
}
|
||||
@@ -695,7 +596,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testKotlinAndroidPluginDetection() {
|
||||
configureByFiles()
|
||||
createProjectSubFile(
|
||||
@@ -709,7 +609,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNoFacetInModuleWithoutKotlinPlugin() {
|
||||
configureByFiles()
|
||||
|
||||
@@ -722,7 +621,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testClasspathWithDependenciesImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -733,7 +631,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testDependenciesClasspathImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -744,7 +641,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJDKImport() {
|
||||
val mockJdkPath = "compiler/testData/mockJDK"
|
||||
object : WriteAction<Unit>() {
|
||||
@@ -798,21 +694,19 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testAPIVersionExceedingLanguageVersion() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
}
|
||||
|
||||
assertAllModulesConfigured()
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testIgnoreProjectLanguageAndAPIVersion() {
|
||||
KotlinCommonCompilerArgumentsHolder.getInstance(myProject).update {
|
||||
languageVersion = "1.0"
|
||||
@@ -823,15 +717,14 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
}
|
||||
|
||||
assertAllModulesConfigured()
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCommonArgumentsImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -864,6 +757,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/main/java" to SourceKotlinRootType,
|
||||
"file:///src/main/kotlin" to SourceKotlinRootType,
|
||||
"file:///src/main/resources" to ResourceKotlinRootType
|
||||
),
|
||||
@@ -871,6 +765,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
)
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/test/java" to TestSourceKotlinRootType,
|
||||
"file:///src/test/kotlin" to TestSourceKotlinRootType,
|
||||
"file:///src/test/resources" to TestResourceKotlinRootType
|
||||
),
|
||||
@@ -879,18 +774,17 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testInternalArgumentsFacetImporting() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
// Version is indeed 1.2
|
||||
Assert.assertEquals(LanguageVersion.KOTLIN_1_2, facetSettings.languageLevel)
|
||||
// Version is indeed 1.3
|
||||
Assert.assertEquals(LanguageVersion.KOTLIN_1_3, facetSettings.languageLevel)
|
||||
|
||||
// We haven't lost internal argument during importing to facet
|
||||
Assert.assertEquals("-XXLanguage:+InlineClasses", facetSettings.compilerSettings?.additionalArguments)
|
||||
Assert.assertEquals("-Xallow-no-source-files -XXLanguage:+InlineClasses", facetSettings.compilerSettings?.additionalArguments)
|
||||
|
||||
// Inline classes are enabled even though LV = 1.2
|
||||
// Inline classes are enabled even though LV = 1.3
|
||||
Assert.assertEquals(
|
||||
LanguageFeature.State.ENABLED,
|
||||
getModule("project_main").languageVersionSettings.getFeatureSupport(LanguageFeature.InlineClasses)
|
||||
@@ -900,7 +794,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testStableModuleNameWhileUsingGradleJS() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -913,7 +806,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testStableModuleNameWhileUsingGradleJVM() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -925,13 +817,12 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNoFriendPathsAreShown() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
Assert.assertEquals(
|
||||
"-version",
|
||||
"-Xallow-no-source-files",
|
||||
testFacetSettings.compilerSettings!!.additionalArguments
|
||||
)
|
||||
|
||||
@@ -939,7 +830,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testSharedLanguageVersion() {
|
||||
configureByFiles()
|
||||
|
||||
@@ -949,11 +839,10 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
importProject()
|
||||
|
||||
TestCase.assertEquals("1.2", holder.settings.languageVersion)
|
||||
TestCase.assertEquals("1.3", holder.settings.languageVersion)
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNonSharedLanguageVersion() {
|
||||
configureByFiles()
|
||||
val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)
|
||||
|
||||
@@ -72,7 +72,6 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
|
||||
}
|
||||
}
|
||||
|
||||
//ToDo: Remove @TargetVersions("4.7 <=> 6.0") after updating plugin versions in testData
|
||||
class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
private fun assertSameKotlinSdks(vararg moduleNames: String) {
|
||||
@@ -83,32 +82,31 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(testFacetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
|
||||
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -142,28 +140,27 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImport_1_1_2() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(testFacetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -187,28 +184,27 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportWithCustomSourceSets() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings("project_myMain")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(facetSettings("project_myTest")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -234,28 +230,27 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportWithCustomSourceSets_1_1_2() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings("project_myMain")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm18, targetPlatform)
|
||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmp -Xsingle-module",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmp -Xsingle-module",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
with(facetSettings("project_myTest")) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||
Assert.assertEquals(
|
||||
"-Xdump-declarations-to=tmpTest",
|
||||
"-Xallow-no-source-files -Xdump-declarations-to=tmpTest",
|
||||
compilerSettings!!.additionalArguments
|
||||
)
|
||||
}
|
||||
@@ -279,7 +274,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCoroutineImportByOptions() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -290,7 +284,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCoroutineImportByProperties() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -460,14 +453,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportByPlatformPlugin() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
}
|
||||
|
||||
@@ -556,14 +548,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJvmImportByKotlinPlugin() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
Assert.assertEquals(JvmPlatforms.jvm16, targetPlatform)
|
||||
}
|
||||
|
||||
@@ -613,14 +604,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testArgumentEscaping() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals(
|
||||
listOf("-Xbuild-file=module with spaces"),
|
||||
listOf("-Xallow-no-source-files", "-Xbuild-file=module with spaces"),
|
||||
compilerSettings!!.additionalArgumentsAsList
|
||||
)
|
||||
}
|
||||
@@ -695,7 +685,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testKotlinAndroidPluginDetection() {
|
||||
configureByFiles()
|
||||
createProjectSubFile(
|
||||
@@ -709,7 +698,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNoFacetInModuleWithoutKotlinPlugin() {
|
||||
configureByFiles()
|
||||
|
||||
@@ -722,7 +710,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testClasspathWithDependenciesImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -733,7 +720,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testDependenciesClasspathImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -744,7 +730,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testJDKImport() {
|
||||
object : WriteAction<Unit>() {
|
||||
override fun run(result: Result<Unit>) {
|
||||
@@ -795,21 +780,19 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testAPIVersionExceedingLanguageVersion() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
}
|
||||
|
||||
assertAllModulesConfigured()
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testIgnoreProjectLanguageAndAPIVersion() {
|
||||
KotlinCommonCompilerArgumentsHolder.getInstance(myProject).update {
|
||||
languageVersion = "1.0"
|
||||
@@ -820,15 +803,14 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
importProject()
|
||||
|
||||
with(facetSettings) {
|
||||
Assert.assertEquals("1.1", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", languageLevel!!.versionString)
|
||||
Assert.assertEquals("1.3", apiLevel!!.versionString)
|
||||
}
|
||||
|
||||
assertAllModulesConfigured()
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testCommonArgumentsImport() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -861,6 +843,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/main/java" to SourceKotlinRootType,
|
||||
"file:///src/main/kotlin" to SourceKotlinRootType,
|
||||
"file:///src/main/resources" to ResourceKotlinRootType
|
||||
),
|
||||
@@ -868,6 +851,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
)
|
||||
Assert.assertEquals(
|
||||
listOf(
|
||||
"file:///src/test/java" to TestSourceKotlinRootType,
|
||||
"file:///src/test/kotlin" to TestSourceKotlinRootType,
|
||||
"file:///src/test/resources" to TestResourceKotlinRootType
|
||||
),
|
||||
@@ -876,18 +860,17 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testInternalArgumentsFacetImporting() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
// Version is indeed 1.2
|
||||
Assert.assertEquals(LanguageVersion.KOTLIN_1_2, facetSettings.languageLevel)
|
||||
// Version is indeed 1.3
|
||||
Assert.assertEquals(LanguageVersion.KOTLIN_1_3, facetSettings.languageLevel)
|
||||
|
||||
// We haven't lost internal argument during importing to facet
|
||||
Assert.assertEquals("-XXLanguage:+InlineClasses", facetSettings.compilerSettings?.additionalArguments)
|
||||
Assert.assertEquals("-Xallow-no-source-files -XXLanguage:+InlineClasses", facetSettings.compilerSettings?.additionalArguments)
|
||||
|
||||
// Inline classes are enabled even though LV = 1.2
|
||||
// Inline classes are enabled even though LV = 1.3
|
||||
Assert.assertEquals(
|
||||
LanguageFeature.State.ENABLED,
|
||||
getModule("project_main").languageVersionSettings.getFeatureSupport(LanguageFeature.InlineClasses)
|
||||
@@ -897,7 +880,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testStableModuleNameWhileUsingGradleJS() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -910,7 +892,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testStableModuleNameWhileUsingGradleJVM() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
@@ -922,13 +903,12 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNoFriendPathsAreShown() {
|
||||
configureByFiles()
|
||||
importProject()
|
||||
|
||||
Assert.assertEquals(
|
||||
"-version",
|
||||
"-Xallow-no-source-files",
|
||||
testFacetSettings.compilerSettings!!.additionalArguments
|
||||
)
|
||||
|
||||
@@ -936,7 +916,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testSharedLanguageVersion() {
|
||||
configureByFiles()
|
||||
|
||||
@@ -946,11 +925,10 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
||||
|
||||
importProject()
|
||||
|
||||
TestCase.assertEquals("1.2", holder.settings.languageVersion)
|
||||
TestCase.assertEquals("1.3", holder.settings.languageVersion)
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetVersions("4.7 <=> 6.0")
|
||||
fun testNonSharedLanguageVersion() {
|
||||
configureByFiles()
|
||||
val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)
|
||||
|
||||
@@ -4,14 +4,14 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
|
||||
@@ -7,10 +7,14 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin-platform-jvm'
|
||||
|
||||
compileKotlin {
|
||||
|
||||
@@ -7,14 +7,18 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
compile "org.apache.logging.log4j:log4j-core:2.7"
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.40"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72"
|
||||
}
|
||||
|
||||
compileKotlinCommon{
|
||||
|
||||
@@ -7,14 +7,18 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
@@ -7,12 +7,16 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
compile "org.apache.logging.log4j:log4j-core:2.7"
|
||||
}
|
||||
|
||||
@@ -4,12 +4,12 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
|
||||
kotlinOptions.languageVersion = "1.2"
|
||||
kotlinOptions.languageVersion = "1.3"
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
|
||||
compile "org.apache.logging.log4j:log4j-core:2.7"
|
||||
}
|
||||
|
||||
|
||||
@@ -4,14 +4,18 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
|
||||
@@ -7,7 +7,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,10 +7,14 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
sourceSets {
|
||||
@@ -27,7 +31,7 @@ srcDir 'test'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
compileMyMainKotlin {
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
group 'Again'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
myMain {
|
||||
kotlin {
|
||||
srcDir 'src'
|
||||
}
|
||||
}
|
||||
myTest {
|
||||
kotlin {
|
||||
srcDir 'test'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.2-5"
|
||||
}
|
||||
|
||||
compileMyMainKotlin {
|
||||
kotlinOptions.jvmTarget = "1.7"
|
||||
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
|
||||
}
|
||||
|
||||
compileMyTestKotlin {
|
||||
kotlinOptions.jvmTarget = "1.6"
|
||||
kotlinOptions.apiVersion = "1.0"
|
||||
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
group 'Again'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
url 'https://dl.bintray.com/kotlin/kotlin-dev'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.2-5"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.jvmTarget = "1.7"
|
||||
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
|
||||
}
|
||||
|
||||
compileTestKotlin {
|
||||
kotlinOptions.jvmTarget = "1.6"
|
||||
kotlinOptions.apiVersion = "1.0"
|
||||
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
|
||||
}
|
||||
@@ -9,7 +9,7 @@ buildscript {
|
||||
}
|
||||
dependencies {
|
||||
classpath "com.android.tools.build:gradle:3.1.2"
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50"
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.1"
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.1"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
|
||||
}
|
||||
|
||||
@@ -2,15 +2,19 @@ buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
url 'https://dl.bintray.com/kotlin/kotlin-dev'
|
||||
url 'https://dl.bintray.com/kotlin/kotlin-dev'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
|
||||
repositories {
|
||||
@@ -21,5 +25,5 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,6 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
|
||||
implement project(":")
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,6 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
implement project(":")
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72"
|
||||
}
|
||||
|
||||
compileKotlinCommon {
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,6 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
|
||||
implement project(":")
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,6 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
implement project(":")
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,5 +14,5 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-common"
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,5 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,9 +15,9 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.languageVersion = "1.2"
|
||||
kotlinOptions.languageVersion = "1.3"
|
||||
}
|
||||
|
||||
@@ -32,4 +32,5 @@ org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDepen
|
||||
"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule[8: Gradle-6.5.1, KotlinGradlePlugin-master]", NoSuchMethodError,,
|
||||
"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid[7: Gradle-6.5.1, KotlinGradlePlugin-latest stable]", NoSuchMethodError,,
|
||||
"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid[8: Gradle-6.5.1, KotlinGradlePlugin-master]", NoSuchMethodError,,
|
||||
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testJDKImport, Old story with Idea core,,
|
||||
"org.jetbrains.kotlin.ide.konan.gradle.GradleNativeLibrariesInIDENamingTest.testLibrariesNaming[0: with Gradle-4.10.2]", Old IDE with new plugin problem,,
|
||||
@@ -123,4 +123,5 @@ org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDepen
|
||||
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[8: Gradle-6.5.1, KotlinGradlePlugin-master]", KMM-304,,
|
||||
"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[7: Gradle-6.5.1, KotlinGradlePlugin-latest stable]", NoSuchMethodError,,
|
||||
"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[8: Gradle-6.5.1, KotlinGradlePlugin-master]", NoSuchMethodError,,
|
||||
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testJDKImport, Old story with Idea core,,
|
||||
"org.jetbrains.kotlin.ide.konan.gradle.GradleNativeLibrariesInIDENamingTest.testLibrariesNaming[0: with Gradle-4.10.2]", Old IDE with new plugin problem,,
|
||||
Reference in New Issue
Block a user