From d647a31e1d7192413ec8b5805d641f3f3fb3f519 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Tue, 30 Jul 2019 13:27:27 +0200 Subject: [PATCH] Switch reactor to JDK 11, kotlin lib to 1.3.31. --- reactor/.idea/compiler.xml | 10 +++---- ...ins_intellij_deps_trove4j_1_0_20181211.xml | 13 +++++++++ ...tbrains_kotlin_kotlin_compiler_1_3_31.xml} | 8 +++--- ...ins_kotlin_kotlin_maven_plugin_1_3_31.xml} | 8 +++--- ...etbrains_kotlin_kotlin_reflect_1_3_31.xml} | 8 +++--- ...s_kotlin_kotlin_script_runtime_1_3_31.xml} | 8 +++--- ...kotlin_kotlin_scripting_common_1_3_31.xml} | 8 +++--- ...tlin_kotlin_scripting_compiler_1_3_31.xml} | 8 +++--- ...ns_kotlin_kotlin_scripting_impl_1_3_31.xml | 13 +++++++++ ...ns_kotlin_kotlin_scripting_jvm_1_3_31.xml} | 8 +++--- ...jetbrains_kotlin_kotlin_stdlib_1_3_31.xml} | 8 +++--- ...ns_kotlin_kotlin_stdlib_common_1_3_31.xml} | 8 +++--- ...kotlinx_kotlinx_coroutines_core_1_0_1.xml} | 8 +++--- reactor/.idea/misc.xml | 2 +- reactor/Core/Core.iml | 28 ++++++++++--------- reactor/Reactor.iml | 28 ++++++++++--------- reactor/Test/Test.iml | 28 ++++++++++--------- reactor/pom.xml | 8 +++--- 18 files changed, 121 insertions(+), 89 deletions(-) create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_31.xml} (66%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_31.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_31.xml} (66%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_31.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_31.xml} (66%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_31.xml} (66%) create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_impl_1_3_31.xml rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_31.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml} (57%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml => Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_1.xml} (56%) diff --git a/reactor/.idea/compiler.xml b/reactor/.idea/compiler.xml index 3639a556..47848aac 100644 --- a/reactor/.idea/compiler.xml +++ b/reactor/.idea/compiler.xml @@ -20,17 +20,17 @@ - - + + - + - - + + diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml b/reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml new file mode 100644 index 00000000..85ff549c --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_31.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_31.xml index a58abdc3..31e4aaae 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_31.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_31.xml index e42d4e72..edded185 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_31.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_31.xml index 171bd035..3543b698 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_31.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_31.xml index d514b859..3278611a 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_31.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_31.xml index 4b717d1c..60804298 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_31.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_31.xml index 3b3c9450..6e9dc700 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_impl_1_3_31.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_impl_1_3_31.xml new file mode 100644 index 00000000..32e1a49e --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_impl_1_3_31.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_31.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_31.xml index e263fc9b..fbf78eb6 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml similarity index 57% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml index a67012d7..3832e4a4 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml index 0ec0111a..5799f6a6 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_1.xml similarity index 56% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_1.xml index 7ad42f0b..b70c6f5b 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/misc.xml b/reactor/.idea/misc.xml index ad9d2b12..ba6da767 100644 --- a/reactor/.idea/misc.xml +++ b/reactor/.idea/misc.xml @@ -45,7 +45,7 @@ - + diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml index 4bc9f41e..260f3768 100644 --- a/reactor/Core/Core.iml +++ b/reactor/Core/Core.iml @@ -9,10 +9,10 @@ - + - - + @@ -39,10 +39,10 @@ - - + + - + @@ -67,13 +67,15 @@ - - - - - - - + + + + + + + + + diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml index f4fc1238..413d5ef9 100644 --- a/reactor/Reactor.iml +++ b/reactor/Reactor.iml @@ -2,10 +2,10 @@ - + - - + @@ -30,10 +30,10 @@ - - + + - + @@ -58,13 +58,15 @@ - - - - - - - + + + + + + + + + diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml index ae1eb618..6d4aa7ba 100644 --- a/reactor/Test/Test.iml +++ b/reactor/Test/Test.iml @@ -10,10 +10,10 @@ - + - - + @@ -42,10 +42,10 @@ - - + + - + @@ -70,13 +70,15 @@ - - - - - - - + + + + + + + + + diff --git a/reactor/pom.xml b/reactor/pom.xml index da433d81..cc552f57 100644 --- a/reactor/pom.xml +++ b/reactor/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 1.3.11 + 1.3.31 0.7 @@ -52,8 +52,8 @@ maven-compiler-plugin 3.2 - 1.8 - 1.8 + 11 + 11 @@ -75,7 +75,7 @@ ${kotlin.version} - 1.8 + 11