Merge branch 'master' into mime-generate

core/api/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

core/ktor/client/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

core/ktor/common/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

gradle.properties

@@ -4,10 +4,10 @@ kotlin_version=1.4.0
 kotlin_coroutines_version=1.3.9
 kotlin_serialisation_core_version=1.0.0-RC
 
-ktor_version=1.3.2-1.4.0-rc
+ktor_version=1.4.0
 
 klockVersion=1.12.0
-uuidVersion=0.2.0
+uuidVersion=0.2.1
 
 exposed_version=0.26.2
 test_sqlite_version=3.32.3.2

ktor/client/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

ktor/common/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

markups/commons/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

markups/html/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

publishing/api/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

publishing/ktor/client/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

publishing/ktor/common/build.gradle

@@ -29,7 +29,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

utils/common/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {

utils/repos/common/build.gradle

@@ -31,7 +31,10 @@ repositories {
 
 kotlin {
     jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }
 
     sourceSets {
         commonMain {