From be1e4bac18935285be095ab8ca13a23f55d189d1 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Tue, 12 Jul 2022 11:17:09 +0200 Subject: [PATCH] Bump up version of Kotlin and JUnit --- .../libraries/Maven__junit_junit_4_13_1.xml | 13 ------- .../libraries/Maven__junit_junit_4_13_2.xml | 13 +++++++ ...tbrains_kotlin_kotlin_compiler_1_5_10.xml} | 8 ++--- ...ins_kotlin_kotlin_maven_plugin_1_5_10.xml} | 8 ++--- ...etbrains_kotlin_kotlin_reflect_1_5_10.xml} | 8 ++--- ...s_kotlin_kotlin_script_runtime_1_5_10.xml} | 8 ++--- ...kotlin_kotlin_scripting_common_1_5_10.xml} | 8 ++--- ...tlin_kotlin_scripting_compiler_1_5_10.xml} | 8 ++--- ...kotlin_scripting_compiler_impl_1_5_10.xml} | 8 ++--- ...ins_kotlin_kotlin_scripting_js_1_5_10.xml} | 8 ++--- ...ns_kotlin_kotlin_scripting_jvm_1_5_10.xml} | 8 ++--- ...jetbrains_kotlin_kotlin_stdlib_1_5_10.xml} | 8 ++--- ...ns_kotlin_kotlin_stdlib_common_1_5_10.xml} | 8 ++--- ...etbrains_kotlin_kotlin_util_io_1_5_10.xml} | 8 ++--- ...brains_kotlin_kotlin_util_klib_1_5_10.xml} | 8 ++--- ...kotlinx_kotlinx_coroutines_core_1_3_8.xml} | 8 ++--- reactor/Core/Core.iml | 32 ++++++++--------- .../mps/logic/reactor/core/Dispatcher.kt | 1 - reactor/Reactor.iml | 32 ++++++++--------- reactor/Test/Test.iml | 34 +++++++++---------- reactor/Test/pom.xml | 2 +- reactor/pom.xml | 2 +- 22 files changed, 120 insertions(+), 121 deletions(-) delete mode 100644 reactor/.idea/libraries/Maven__junit_junit_4_13_1.xml create mode 100644 reactor/.idea/libraries/Maven__junit_junit_4_13_2.xml rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml} (55%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_util_io_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml} (55%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml} (66%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml} (66%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml} (56%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml} (57%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml} (55%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_util_klib_1_3_70.xml => Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml} (65%) rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1.xml => Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml} (65%) diff --git a/reactor/.idea/libraries/Maven__junit_junit_4_13_1.xml b/reactor/.idea/libraries/Maven__junit_junit_4_13_1.xml deleted file mode 100644 index 9fa24fcb..00000000 --- a/reactor/.idea/libraries/Maven__junit_junit_4_13_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__junit_junit_4_13_2.xml b/reactor/.idea/libraries/Maven__junit_junit_4_13_2.xml new file mode 100644 index 00000000..606c352d --- /dev/null +++ b/reactor/.idea/libraries/Maven__junit_junit_4_13_2.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml similarity index 55% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml index 93cfad98..14f1e12a 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml index bf3f7c64..dce772a7 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_3_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml similarity index 55% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml index 51b8fb18..f9330a4a 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml index 7a9cf4ac..d15b9b30 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml index ff83d145..cc3aae38 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml similarity index 66% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml index 707abdfe..ab5d5a63 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_3_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml similarity index 56% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml index 88034fc6..e6781e86 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_3_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml index 018eebbc..5ffce5ba 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml index 374dff6b..aa0a301e 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml similarity index 57% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml index 3853b0e7..b7b5f1d5 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml index bbe52887..173b3dce 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.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_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml similarity index 55% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml index 8f74fb2c..bdfcb007 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_3_70.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_3_70.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml index 41aba083..93c12879 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_3_70.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml similarity index 65% rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1.xml rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml index 1d65e11b..ad28f5e1 100644 --- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1.xml +++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml index e3fedf05..24c28d51 100644 --- a/reactor/Core/Core.iml +++ b/reactor/Core/Core.iml @@ -13,8 +13,8 @@ @@ -40,10 +40,10 @@ - - + - + + @@ -68,18 +68,18 @@ - - - + + + - - - - - - - - + + + + + + + + diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt index 68c096ff..df95508b 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt @@ -17,7 +17,6 @@ package jetbrains.mps.logic.reactor.core import gnu.trove.map.hash.TIntObjectHashMap -import org.jetbrains.kotlin.fir.resolve.getOrPut typealias DispatchingFrontState = Map diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml index 2784c132..b53170af 100644 --- a/reactor/Reactor.iml +++ b/reactor/Reactor.iml @@ -6,8 +6,8 @@ @@ -30,10 +30,10 @@ - - + - + + @@ -58,18 +58,18 @@ - - - + + + - - - - - - - - + + + + + + + + diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml index c2959c75..5d8951ae 100644 --- a/reactor/Test/Test.iml +++ b/reactor/Test/Test.iml @@ -14,8 +14,8 @@ @@ -40,12 +40,12 @@ - + - - + - + + @@ -70,18 +70,18 @@ - - - + + + - - - - - - - - + + + + + + + + diff --git a/reactor/Test/pom.xml b/reactor/Test/pom.xml index 84ab7b03..2c522818 100644 --- a/reactor/Test/pom.xml +++ b/reactor/Test/pom.xml @@ -23,7 +23,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/reactor/pom.xml b/reactor/pom.xml index 5f17c77a..5cbbdaff 100644 --- a/reactor/pom.xml +++ b/reactor/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 1.3.70 + 1.5.10 0.7