Merge branch 'master' into mime-generate

2020-08-20 12:48:11 +06:00 · 2020-08-20 12:48:11 +06:00 · 2e2632caae
commit 2e2632caae
parent ae275018ba f8123c65cd
13 changed files with 50 additions and 14 deletions
--- a/core/api/build.gradle
+++ b/core/api/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/core/ktor/client/build.gradle
+++ b/core/ktor/client/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/core/ktor/common/build.gradle
+++ b/core/ktor/common/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/gradle.properties
+++ b/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
--- a/ktor/client/build.gradle
+++ b/ktor/client/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/ktor/common/build.gradle
+++ b/ktor/common/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/markups/commons/build.gradle
+++ b/markups/commons/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/markups/html/build.gradle
+++ b/markups/html/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/publishing/api/build.gradle
+++ b/publishing/api/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/publishing/ktor/client/build.gradle
+++ b/publishing/ktor/client/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/publishing/ktor/common/build.gradle
+++ b/publishing/ktor/common/build.gradle
@ -29,7 +29,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/utils/common/build.gradle
+++ b/utils/common/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {
--- a/utils/repos/common/build.gradle
+++ b/utils/repos/common/build.gradle
@ -31,7 +31,10 @@ repositories {

 kotlin {
    jvm()
-    js { browser() }
+    js (BOTH) {
+        browser()
+        nodejs()
+    }

    sourceSets {
        commonMain {