From e881bccfca8cc3bfaffbfd9535a67086b10b3de2 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 2 Sep 2022 16:07:57 +0200
Subject: [PATCH] Switch to Kotlin 1.7.0

---
 reactor/.idea/kotlinc.xml                     |  3 ++
 ...ns_intellij_deps_trove4j_1_0_20200330.xml} |  8 +++---
 ...etbrains_kotlin_kotlin_compiler_1_5_10.xml | 13 ---------
 ...etbrains_kotlin_kotlin_compiler_1_7_0.xml} |  8 +++---
 ...ains_kotlin_kotlin_maven_plugin_1_7_0.xml} |  8 +++---
 ...jetbrains_kotlin_kotlin_reflect_1_7_0.xml} |  8 +++---
 ...ns_kotlin_kotlin_script_runtime_1_7_0.xml} |  8 +++---
 ..._kotlin_kotlin_scripting_common_1_7_0.xml} |  8 +++---
 ...otlin_kotlin_scripting_compiler_1_7_0.xml} |  8 +++---
 ..._kotlin_scripting_compiler_impl_1_7_0.xml} |  8 +++---
 ...ains_kotlin_kotlin_scripting_js_1_5_10.xml | 13 ---------
 ...ins_kotlin_kotlin_scripting_jvm_1_7_0.xml} |  8 +++---
 ..._jetbrains_kotlin_kotlin_stdlib_1_7_0.xml} |  8 +++---
 ...ins_kotlin_kotlin_stdlib_common_1_7_0.xml} |  8 +++---
 ...tbrains_kotlin_kotlin_util_klib_1_5_10.xml | 13 ---------
 ..._kotlinx_kotlinx_coroutines_core_1_3_8.xml | 13 ---------
 reactor/.idea/misc.xml                        |  2 +-
 reactor/.idea/runConfigurations.xml           | 10 +++++++
 reactor/Core/Core.iml                         | 28 ++++++++-----------
 reactor/Core/pom.xml                          |  2 +-
 reactor/Reactor.iml                           | 28 ++++++++-----------
 reactor/Test/Test.iml                         | 28 ++++++++-----------
 reactor/Test/pom.xml                          |  2 +-
 reactor/pom.xml                               |  4 +--
 24 files changed, 98 insertions(+), 149 deletions(-)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml => Maven__org_jetbrains_intellij_deps_trove4j_1_0_20200330.xml} (65%)
 delete mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_compiler_1_7_0.xml} (55%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_7_0.xml} (63%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_reflect_1_7_0.xml} (57%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_7_0.xml} (61%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_7_0.xml} (60%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_7_0.xml} (59%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_7_0.xml} (56%)
 delete mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_7_0.xml} (62%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_1_7_0.xml} (55%)
 rename reactor/.idea/libraries/{Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml => Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_0.xml} (62%)
 delete mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml
 delete mode 100644 reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml
 create mode 100644 reactor/.idea/runConfigurations.xml

diff --git a/reactor/.idea/kotlinc.xml b/reactor/.idea/kotlinc.xml
index 5806fb33..f7308eeb 100644
--- a/reactor/.idea/kotlinc.xml
+++ b/reactor/.idea/kotlinc.xml
@@ -4,4 +4,7 @@
     <option name="sourceMapEmbedSources" />
     <option name="sourceMapPrefix" />
   </component>
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
 </project>
\ No newline at end of file
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_20200330.xml
similarity index 65%
rename from reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20181211.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_intellij_deps_trove4j_1_0_20200330.xml
index 85ff549c..baefed31 100644
--- 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_20200330.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20181211">
+  <library name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20200330">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml
deleted file mode 100644
index 14f1e12a..00000000
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.5.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.5.10/kotlin-compiler-1.5.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.5.10/kotlin-compiler-1.5.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.5.10/kotlin-compiler-1.5.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_7_0.xml
similarity index 55%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_7_0.xml
index bdfcb007..fd597bb4 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_io_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-util-io:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-io/1.5.10/kotlin-util-io-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.7.0/kotlin-compiler-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-io/1.5.10/kotlin-util-io-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.7.0/kotlin-compiler-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-io/1.5.10/kotlin-util-io-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.7.0/kotlin-compiler-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_7_0.xml
similarity index 63%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_7_0.xml
index dce772a7..55ae7085 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.5.10/kotlin-maven-plugin-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.7.0/kotlin-maven-plugin-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.5.10/kotlin-maven-plugin-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.7.0/kotlin-maven-plugin-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.5.10/kotlin-maven-plugin-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.7.0/kotlin-maven-plugin-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_7_0.xml
similarity index 57%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_7_0.xml
index b7b5f1d5..08ffc443 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.7.0/kotlin-reflect-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.7.0/kotlin-reflect-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.7.0/kotlin-reflect-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_7_0.xml
similarity index 61%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_7_0.xml
index d15b9b30..992236fa 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_script_runtime_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.5.10/kotlin-script-runtime-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0/kotlin-script-runtime-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.5.10/kotlin-script-runtime-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0/kotlin-script-runtime-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.5.10/kotlin-script-runtime-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0/kotlin-script-runtime-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_7_0.xml
similarity index 60%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_7_0.xml
index cc3aae38..77802311 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_common_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.5.10/kotlin-scripting-common-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0/kotlin-scripting-common-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.5.10/kotlin-scripting-common-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0/kotlin-scripting-common-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.5.10/kotlin-scripting-common-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0/kotlin-scripting-common-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_7_0.xml
similarity index 59%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_7_0.xml
index ab5d5a63..6c2829c7 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.5.10/kotlin-scripting-compiler-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.7.0/kotlin-scripting-compiler-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.5.10/kotlin-scripting-compiler-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.7.0/kotlin-scripting-compiler-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.5.10/kotlin-scripting-compiler-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.7.0/kotlin-scripting-compiler-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_7_0.xml
similarity index 56%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_7_0.xml
index e6781e86..0f28c4e2 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_compiler_impl_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.5.10/kotlin-scripting-compiler-impl-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.7.0/kotlin-scripting-compiler-impl-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.5.10/kotlin-scripting-compiler-impl-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.7.0/kotlin-scripting-compiler-impl-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.5.10/kotlin-scripting-compiler-impl-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.7.0/kotlin-scripting-compiler-impl-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml
deleted file mode 100644
index 5ffce5ba..00000000
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_js_1_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-js:1.5.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-js/1.5.10/kotlin-scripting-js-1.5.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-js/1.5.10/kotlin-scripting-js-1.5.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-js/1.5.10/kotlin-scripting-js-1.5.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_7_0.xml
similarity index 62%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_7_0.xml
index aa0a301e..9528717e 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_scripting_jvm_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.5.10/kotlin-scripting-jvm-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0/kotlin-scripting-jvm-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.5.10/kotlin-scripting-jvm-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0/kotlin-scripting-jvm-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.5.10/kotlin-scripting-jvm-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0/kotlin-scripting-jvm-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_7_0.xml
similarity index 55%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_7_0.xml
index f9330a4a..da3d591e 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.5.10/kotlin-reflect-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.5.10/kotlin-reflect-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.5.10/kotlin-reflect-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_0.xml
similarity index 62%
rename from reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml
rename to reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_0.xml
index 173b3dce..9393d58f 100644
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_10.xml
+++ b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml
deleted file mode 100644
index 93c12879..00000000
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_util_klib_1_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-util-klib:1.5.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-klib/1.5.10/kotlin-util-klib-1.5.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-klib/1.5.10/kotlin-util-klib-1.5.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-util-klib/1.5.10/kotlin-util-klib-1.5.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml b/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml
deleted file mode 100644
index ad28f5e1..00000000
--- a/reactor/.idea/libraries/Maven__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.8/kotlinx-coroutines-core-1.3.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.8/kotlinx-coroutines-core-1.3.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.8/kotlinx-coroutines-core-1.3.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/misc.xml b/reactor/.idea/misc.xml
index 2d55fba6..e65de344 100644
--- a/reactor/.idea/misc.xml
+++ b/reactor/.idea/misc.xml
@@ -45,7 +45,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressKotlinCodeStyleNotification">
diff --git a/reactor/.idea/runConfigurations.xml b/reactor/.idea/runConfigurations.xml
new file mode 100644
index 00000000..797acea5
--- /dev/null
+++ b/reactor/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml
index f1d629be..8dce5065 100644
--- a/reactor/Core/Core.iml
+++ b/reactor/Core/Core.iml
@@ -37,13 +37,13 @@
       <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="jbr-17" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.7.0" 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" />
@@ -68,18 +68,14 @@
     <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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.5.10" 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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-js:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-klib:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-io:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20200330" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.7.0" 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" />
diff --git a/reactor/Core/pom.xml b/reactor/Core/pom.xml
index 40524f4f..12ca5d0a 100644
--- a/reactor/Core/pom.xml
+++ b/reactor/Core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>jetbrains.mps.logic.conreactor</groupId>
         <artifactId>conreactor-main</artifactId>
-        <version>0.9.16</version>
+        <version>0.9.17</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml
index aca44c48..336313f4 100644
--- a/reactor/Reactor.iml
+++ b/reactor/Reactor.iml
@@ -28,12 +28,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="jbr-17" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.7.0" 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,18 +58,14 @@
     <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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.5.10" 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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-js:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-klib:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-io:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20200330" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.7.0" 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" />
diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml
index 41816f54..da32f9e9 100644
--- a/reactor/Test/Test.iml
+++ b/reactor/Test/Test.iml
@@ -37,15 +37,15 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="jbr-17" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Core" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" 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.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.7.0" 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,18 +70,14 @@
     <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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.5.10" 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.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-js:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-klib:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-util-io:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.intellij.deps:trove4j:1.0.20200330" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-common:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.7.0" 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" />
diff --git a/reactor/Test/pom.xml b/reactor/Test/pom.xml
index 2c522818..8ed2971a 100644
--- a/reactor/Test/pom.xml
+++ b/reactor/Test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>jetbrains.mps.logic.conreactor</groupId>
         <artifactId>conreactor-main</artifactId>
-        <version>0.9.16</version>
+        <version>0.9.17</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 5cbbdaff..69a270ca 100644
--- a/reactor/pom.xml
+++ b/reactor/pom.xml
@@ -8,13 +8,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.version>1.5.10</kotlin.version>
+        <kotlin.version>1.7.0</kotlin.version>
         <collection.version>0.7</collection.version>
     </properties>
 
     <groupId>jetbrains.mps.logic.conreactor</groupId>
     <artifactId>conreactor-main</artifactId>
-    <version>0.9.16</version>
+    <version>0.9.17</version>
     <packaging>pom</packaging>
 
     <dependencies>