Switch reactor to JDK 11, kotlin lib to 1.3.31.

This commit is contained in:
Fedor Isakov 2019-07-30 13:27:27 +02:00
parent 269306876b
commit d647a31e1d
18 changed files with 121 additions and 89 deletions

View File

@ -20,17 +20,17 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="API" />
<module name="Core" />
<module name="Test" />
<module name="Core" />
<module name="API" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="API" target="1.8" />
<module name="Core" target="1.8" />
<module name="Core" target="11" />
<module name="main" target="1.5" />
<module name="Reactor" target="1.8" />
<module name="Test" target="1.8" />
<module name="Reactor" target="11" />
<module name="Test" target="11" />
<module name="tests" target="1.8" />
<module name="unification-lib" target="1.8" />
</bytecodeTargetLevel>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20181211">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.11/kotlin-compiler-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.31/kotlin-compiler-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.11/kotlin-compiler-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.31/kotlin-compiler-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.11/kotlin-compiler-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.3.31/kotlin-compiler-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.11/kotlin-maven-plugin-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.31/kotlin-maven-plugin-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.11/kotlin-maven-plugin-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.31/kotlin-maven-plugin-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.11/kotlin-maven-plugin-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.3.31/kotlin-maven-plugin-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.11/kotlin-reflect-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.31/kotlin-reflect-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.11/kotlin-reflect-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.31/kotlin-reflect-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.11/kotlin-reflect-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.3.31/kotlin-reflect-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.11/kotlin-script-runtime-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.31/kotlin-script-runtime-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.11/kotlin-script-runtime-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.31/kotlin-script-runtime-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.11/kotlin-script-runtime-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.3.31/kotlin-script-runtime-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.11/kotlin-scripting-common-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.31/kotlin-scripting-common-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.11/kotlin-scripting-common-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.31/kotlin-scripting-common-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.11/kotlin-scripting-common-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.3.31/kotlin-scripting-common-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.11/kotlin-scripting-compiler-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.31/kotlin-scripting-compiler-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.11/kotlin-scripting-compiler-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.31/kotlin-scripting-compiler-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.11/kotlin-scripting-compiler-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.3.31/kotlin-scripting-compiler-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-impl:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-impl/1.3.31/kotlin-scripting-impl-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-impl/1.3.31/kotlin-scripting-impl-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-impl/1.3.31/kotlin-scripting-impl-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.11/kotlin-scripting-jvm-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.31/kotlin-scripting-jvm-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.11/kotlin-scripting-jvm-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.31/kotlin-scripting-jvm-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.11/kotlin-scripting-jvm-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.31/kotlin-scripting-jvm-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.11/kotlin-stdlib-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.11/kotlin-stdlib-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.11/kotlin-stdlib-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.11/kotlin-stdlib-common-1.3.11.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.11/kotlin-stdlib-common-1.3.11-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.11/kotlin-stdlib-common-1.3.11-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1-eap13">
<library name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/0.26.1-eap13/kotlinx-coroutines-core-0.26.1-eap13.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.0.1/kotlinx-coroutines-core-1.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/0.26.1-eap13/kotlinx-coroutines-core-0.26.1-eap13-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.0.1/kotlinx-coroutines-core-1.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/0.26.1-eap13/kotlinx-coroutines-core-0.26.1-eap13-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.0.1/kotlinx-coroutines-core-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -45,7 +45,7 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JB SDK 11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SbtLocalSettings">

View File

@ -9,10 +9,10 @@
</component>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.8" useProjectSettings="false">
<configuration version="2" platform="JVM 11" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="jvmTarget" value="1.8" />
<option name="jvmTarget" value="11" />
<option name="languageVersion" value="1.3" />
<option name="apiVersion" value="1.3" />
<option name="pluginOptions">
@ -28,7 +28,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@ -39,10 +39,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -67,13 +67,15 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1-eap13" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20181211" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-impl:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-compiler-plugin:3.5.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-toolchain:2.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.0.0" level="project" />

View File

@ -2,10 +2,10 @@
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.8" useProjectSettings="false">
<configuration version="2" platform="JVM 11" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="jvmTarget" value="1.8" />
<option name="jvmTarget" value="11" />
<option name="languageVersion" value="1.3" />
<option name="apiVersion" value="1.3" />
<option name="pluginOptions">
@ -21,7 +21,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@ -30,10 +30,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -58,13 +58,15 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1-eap13" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20181211" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-impl:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-compiler-plugin:3.5.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-toolchain:2.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.0.0" level="project" />

View File

@ -10,10 +10,10 @@
</component>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.8" useProjectSettings="false">
<configuration version="2" platform="JVM 11" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="jvmTarget" value="1.8" />
<option name="jvmTarget" value="11" />
<option name="languageVersion" value="1.3" />
<option name="apiVersion" value="1.3" />
<option name="pluginOptions">
@ -29,7 +29,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@ -42,10 +42,10 @@
<orderEntry type="module" module-name="Core" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -70,13 +70,15 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1-eap13" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20181211" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-impl:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-compiler-plugin:3.5.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-toolchain:2.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.0.0" level="project" />

View File

@ -8,7 +8,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>1.3.11</kotlin.version>
<kotlin.version>1.3.31</kotlin.version>
<collection.version>0.7</collection.version>
</properties>
@ -52,8 +52,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
@ -75,7 +75,7 @@
<version>${kotlin.version}</version>
<configuration>
<jvmTarget>1.8</jvmTarget>
<jvmTarget>11</jvmTarget>
</configuration>
<executions>
<execution>