Prepare release

2 files changed, 10 insertions, 30 deletions

diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 1d6208d68d..73765455dd 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -154,6 +154,6 @@
          {shell_docs_ansi,auto}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-@OTP-16718@", "stdlib-3.13", "sasl-3.0", "crypto-5.0"]}
+  {runtime_dependencies, ["erts-12.0", "stdlib-3.13", "sasl-3.0", "crypto-5.0"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 796bec68b3..9508a46f14 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -19,28 +19,16 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 21
 %% - OTP 22
 %% - OTP 23
+%% - OTP 24
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^6\\.0$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.3$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.4$">>,[restart_new_emulator]},
+ [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.5$">>,[restart_new_emulator]},
@@ -53,20 +41,10 @@
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[restart_new_emulator]},
   {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^6\\.0$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.1$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.3$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.4$">>,[restart_new_emulator]},
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^7\\.3$">>,[restart_new_emulator]},
+  {<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.5$">>,[restart_new_emulator]},
@@ -79,4 +57,6 @@
   {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.2$">>,[restart_new_emulator]},
   {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^7\\.3$">>,[restart_new_emulator]},
+  {<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.