From 109be1e56464e15e777eee2c3babd2c8b898ec9e Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Thu, 11 Apr 2019 11:04:30 +0200 Subject: [PATCH] Switch reactor to use Kotlin 1.3. --- ...tbrains_kotlin_kotlin_compiler_1_3_11.xml} | 8 +++---- ...ins_kotlin_kotlin_maven_plugin_1_3_11.xml} | 8 +++---- ...etbrains_kotlin_kotlin_reflect_1_3_11.xml} | 8 +++---- ...s_kotlin_kotlin_script_runtime_1_3_11.xml} | 8 +++---- ..._kotlin_kotlin_scripting_common_1_3_11.xml | 13 ++++++++++++ ...otlin_kotlin_scripting_compiler_1_3_11.xml | 13 ++++++++++++ ...ns_kotlin_kotlin_scripting_jvm_1_3_11.xml} | 8 +++---- ...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml} | 8 +++---- ...ins_kotlin_kotlin_stdlib_common_1_3_11.xml | 13 ++++++++++++ ...x_kotlinx_coroutines_core_0_26_1_eap13.xml | 13 ++++++++++++ reactor/API/API.iml | 21 +++++++++++-------- reactor/Core/Core.iml | 21 +++++++++++-------- reactor/Reactor.iml | 21 +++++++++++-------- reactor/Test/Test.iml | 21 +++++++++++-------- reactor/pom.xml | 7 +------ 15 files changed, 125 insertions(+), 66 deletions(-) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_compiler_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml} (55%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_reflect_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml} (55%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml} (65%) create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_runtime_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml} (52%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_30.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml} (56%) create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml create mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml similarity index 55% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.xml index 4458da82..a58abdc3 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_11.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_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml index 66cbded6..e42d4e72 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_11.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml similarity index 55% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml index f6897471..171bd035 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_11.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_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.xml index e19c1891..d514b859 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_11.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_11.xml new file mode 100644 index 00000000..4b717d1c --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_11.xml @@ -0,0 +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_11.xml new file mode 100644 index 00000000..3b3c9450 --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml similarity index 52% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml index e9f1b4a0..e263fc9b 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_11.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_30.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml similarity index 56% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_30.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml index e43fa720..a67012d7 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_30.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.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_11.xml new file mode 100644 index 00000000..0ec0111a --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml @@ -0,0 +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_0_26_1_eap13.xml new file mode 100644 index 00000000..7ad42f0b --- /dev/null +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/reactor/API/API.iml b/reactor/API/API.iml index b5309b5b..b5f1df11 100644 --- a/reactor/API/API.iml +++ b/reactor/API/API.iml @@ -6,15 +6,14 @@ - @@ -28,10 +27,10 @@ - + + - - + @@ -56,9 +55,13 @@ - - - + + + + + + + diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml index 27448936..7db9df78 100644 --- a/reactor/Core/Core.iml +++ b/reactor/Core/Core.iml @@ -13,15 +13,14 @@ - @@ -38,10 +37,10 @@ - + + - - + @@ -66,9 +65,13 @@ - - - + + + + + + + diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml index b5309b5b..b5f1df11 100644 --- a/reactor/Reactor.iml +++ b/reactor/Reactor.iml @@ -6,15 +6,14 @@ - @@ -28,10 +27,10 @@ - + + - - + @@ -56,9 +55,13 @@ - - - + + + + + + + diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml index ef4f74cd..19714f38 100644 --- a/reactor/Test/Test.iml +++ b/reactor/Test/Test.iml @@ -14,15 +14,14 @@ - @@ -41,10 +40,10 @@ - + + - - + @@ -69,9 +68,13 @@ - - - + + + + + + + diff --git a/reactor/pom.xml b/reactor/pom.xml index c3cd2283..12d02842 100644 --- a/reactor/pom.xml +++ b/reactor/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 1.2.30 + 1.3.11 0.7 @@ -18,11 +18,6 @@ pom - - org.jetbrains.kotlin - kotlin-runtime - ${kotlin.version} - org.jetbrains.kotlin kotlin-stdlib