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

[IDE] Propagate KotlinFacetSettings version and completely drop isReleaseCoroutines flag

Browse Source 
Also this commit removes number of tests related to support
  experimental coroutines
This commit is contained in:
Dmitriy Novozhilov
2020-12-29 13:47:21 +03:00
committed by TeamCityServer
parent e991c9d476
commit af94bcebea
26 changed files with 104 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/configuration/jvmProjectWithV4FacetConfig/module.iml
Vendored
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
</component>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="4" platform="JVM 1.8" useProjectSettings="false">
<compilerSettings>
<option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
</compilerSettings>
<compilerArguments>
<option name="jvmTarget" value="1.8" />
<option name="languageVersion" value="1.4" />
<option name="apiVersion" value="1.2" />
</compilerArguments>
</configuration>
</facet>
</component>
</module>
idea/testData/configuration/jvmProjectWithV4FacetConfig/projectFile.ipr
Vendored
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="CopyrightManager" default="" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/module.iml" filepath="$PROJECT_DIR$/module.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="libraryTable">
<library name="KotlinJavaRuntime (2)">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../mockRuntime11/kotlin-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
</SOURCES>
</library>
</component>
</project>
idea/testData/configuration/jvmProjectWithV4FacetConfig/src/foo.kt
Vendored
View File
idea/testData/configuration/loadAndSaveOldNativePlatformNewNativeFacet/module.iml
Vendored
+1 -2
View File
@@ -9,7 +9,6 @@
<compilerArguments>
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.0" />
<option name="coroutinesEnable" value="true" />
</compilerArguments>
</configuration>
</facet>
@@ -23,4 +22,4 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
</component>
</module>
</module>
idea/testData/configuration/loadAndSaveOldNativePlatformOldNativeFacet/module.iml
Vendored
+1 -2
View File
@@ -9,7 +9,6 @@
<compilerArguments>
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.0" />
<option name="coroutinesEnable" value="true" />
</compilerArguments>
</configuration>
</facet>
@@ -23,4 +22,4 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
</component>
</module>
</module>
idea/testData/configuration/loadAndSaveProjectWithV2FacetConfig/module.iml
Vendored
+1 -2
View File
@@ -10,7 +10,6 @@
<option name="jvmTarget" value="1.7" />
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.0" />
<option name="coroutinesEnable" value="true" />
</compilerArguments>
</configuration>
</facet>
@@ -24,4 +23,4 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
</component>
</module>
</module>
idea/testData/configuration/loadAndSaveProjectWithV2OldPlatformFacetConfig/module.iml
Vendored
+1 -2
View File
@@ -10,7 +10,6 @@
<option name="jvmTarget" value="1.7" />
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.0" />
<option name="coroutinesEnable" value="true" />
</compilerArguments>
</configuration>
</facet>
@@ -24,4 +23,4 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
</component>
</module>
</module>
idea/testData/multiModuleHighlighting/coroutineMixedReleaseStatus/libNew/libN.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package libN
suspend fun newFoo() {}
fun newBuilder(x: suspend () -> Unit) {}
idea/testData/multiModuleHighlighting/coroutineMixedReleaseStatus/libOld/libO.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package libO
suspend fun oldFoo() {}
fun oldBuilder(x: suspend () -> Unit) {}
idea/testData/multiModuleHighlighting/coroutineMixedReleaseStatus/moduleNew/main.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
import libN.*
import libO.*
suspend fun newMain() {
newFoo()
<warning descr="[DEPRECATION] 'oldFoo(): Unit' is deprecated. Experimental coroutines support will be dropped in 1.4">oldFoo</warning>()
// TODO: actually, it's a bug
oldMain()
}
fun newMain2() {
newBuilder {
newMain()
}
<error descr="[ILLEGAL_SUSPEND_FUNCTION_CALL] Suspend function 'oldFoo' should be called only from a coroutine or another suspend function">oldFoo</error>()
}
idea/testData/multiModuleHighlighting/coroutineMixedReleaseStatus/moduleOld/main.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
import libN.*
import libO.*
suspend fun oldMain() {
<error descr="[VERSION_REQUIREMENT_DEPRECATION_ERROR] 'newFoo(): Unit' is only available since Kotlin 1.3 and cannot be used in Kotlin 1.2">newFoo</error>()
oldFoo()
}
fun oldMain2() {
<error descr="[VERSION_REQUIREMENT_DEPRECATION_ERROR] 'newBuilder(suspend () -> Unit): Unit' is only available since Kotlin 1.3 and cannot be used in Kotlin 1.2">newBuilder</error> {
oldMain()
}
oldBuilder {
oldMain()
}
}