Merge pull request #46 from ktorio/rsinukov/1.4.3

Upgrade ktor to 1.4.3
ktorio · Dec 1, 2020 · a35f166 · a35f166
2 parents 2982075 + e1ff2ee
commit a35f166
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.4.2
+version=1.4.3
 kotlin_version=1.3.70
 kotlin.code.style=official
 kotlinx_coroutines_version=1.3.4
diff --git a/ktor-generator-website/resources/index.html b/ktor-generator-website/resources/index.html
@@ -7,13 +7,13 @@
     <link rel="stylesheet" type="text/css" href="lib/bootstrap.min.css"/>
     <link rel="stylesheet" type="text/css" href="styles.css"/>
 
-    <title>Ktor Project Generator (1.4.1)</title>
+    <title>Ktor Project Generator (1.4.3)</title>
 </head>
 <body>
 
 <header class="navbar navbar-dark bg-dark fixed-top">
     <a class="navbar-brand" href="#"><img src="ktor_logo_box.svg"
-                                          style="width:1.6em;height:1.6em;padding-right:0.5em;"/>Ktor Project Generator (1.4.1)</a>
+                                          style="width:1.6em;height:1.6em;padding-right:0.5em;"/>Ktor Project Generator (1.4.3)</a>
 </header>
 
 <div class="container-fluid" style="margin-top:84px;">

diff --git a/ktor-generator/src/commonMain/kotlin/io/ktor/start/Versions.kt b/ktor-generator/src/commonMain/kotlin/io/ktor/start/Versions.kt
@@ -41,10 +41,11 @@ object Versions {
     val V140 = KtorVersion(version = "1.4.0", kotlinVersion = "1.4.0")
     val V141 = KtorVersion(version = "1.4.1", kotlinVersion = "1.4.10")
     val V142 = KtorVersion(version = "1.4.2", kotlinVersion = "1.4.10")
+    val V143 = KtorVersion(version = "1.4.3", kotlinVersion = "1.4.20")
 
-    val ALL = arrayOf(V101, V115, V126, V130, V132, V140, V141, V142)
-    val LAST = V142
-    val LAST_EAP = V142
+    val ALL = arrayOf(V101, V115, V126, V130, V132, V140, V141, V142, V143)
+    val LAST = V143
+    val LAST_EAP = V143
 
     private val VMAP = ALL.associate { it.version to it }
     fun fromString(version: String): KtorVersion? = VMAP[version]

diff --git a/ktor-intellij-plugin/resources/META-INF/plugin.xml b/ktor-intellij-plugin/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
     <id>io.ktor.intellij.plugin</id>
 
     <name>Ktor</name>
-    <version>1.4.1</version>
+    <version>1.4.3</version>
     <vendor url="https://www.jetbrains.com">JetBrains</vendor>
     <description>
         <![CDATA[
@@ -18,6 +18,12 @@
 
             <h2>Changelog</h2>
 
+            <h3>1.4.3</h3>
+
+            <ul>
+                <li>Ktor 1.4.3</li>
+            </ul>
+
             <h3>1.4.2</h3>
 
             <ul>