From 9e243a469ae6544e8cf523ad09b959f541c3f565 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Wed, 11 Mar 2020 16:18:17 +0100
Subject: Upgrade to Kotlin 1.3.70 + other dependencies (Coroutinse,
 Serialization, Spring Boot) Major refactoring of build architecture.

---
 kvision-modules/kvision-redux/build.gradle         | 16 -------
 kvision-modules/kvision-redux/build.gradle.kts     | 52 ++++++++++++++++++++++
 .../kvision-redux/package.json.d/project.info      |  3 --
 .../kotlin/pl/treksoft/kvision/redux/ReduxStore.kt |  7 ++-
 .../kvision-redux/webpack.config.d/bootstrap.js    |  3 ++
 .../kvision-redux/webpack.config.d/file.js         |  9 ++++
 6 files changed, 70 insertions(+), 20 deletions(-)
 delete mode 100644 kvision-modules/kvision-redux/build.gradle
 create mode 100644 kvision-modules/kvision-redux/build.gradle.kts
 delete mode 100644 kvision-modules/kvision-redux/package.json.d/project.info
 create mode 100644 kvision-modules/kvision-redux/webpack.config.d/bootstrap.js
 create mode 100644 kvision-modules/kvision-redux/webpack.config.d/file.js

(limited to 'kvision-modules/kvision-redux')

diff --git a/kvision-modules/kvision-redux/build.gradle b/kvision-modules/kvision-redux/build.gradle
deleted file mode 100644
index d7ed852c..00000000
--- a/kvision-modules/kvision-redux/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-apply from: "../shared.gradle"
-
-dependencies {
-    compile ("org.jetbrains:kotlin-redux:$kotlinReduxVersion") {
-        exclude group: "org.jetbrains.kotlinx", module: "kotlinx-html-js"
-    }
-}
-
-kotlinFrontend {
-
-    npm {
-        dependency("redux", "4.0.5")
-        dependency("redux-thunk", "2.3.0")
-    }
-
-}
diff --git a/kvision-modules/kvision-redux/build.gradle.kts b/kvision-modules/kvision-redux/build.gradle.kts
new file mode 100644
index 00000000..15e65cf2
--- /dev/null
+++ b/kvision-modules/kvision-redux/build.gradle.kts
@@ -0,0 +1,52 @@
+buildscript {
+    extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true")
+}
+
+plugins {
+    kotlin("js")
+    id("maven-publish")
+}
+
+repositories()
+
+val kotlinReduxVersion: String by project
+
+kotlin {
+    kotlinJsTargets()
+}
+
+dependencies {
+    implementation(kotlin("stdlib-js"))
+    api(rootProject)
+    api("org.jetbrains:kotlin-redux:$kotlinReduxVersion") {
+        exclude("org.jetbrains.kotlinx", "kotlinx-html-js")
+    }
+    implementation(npm("redux", "4.0.5"))
+    implementation(npm("redux-thunk", "2.3.0"))
+    testImplementation(kotlin("test-js"))
+}
+
+val sourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(kotlin.sourceSets.main.get().kotlin)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("kotlin") {
+            from(components["kotlin"])
+            artifact(tasks["sourcesJar"])
+            pom {
+                defaultPom()
+            }
+        }
+    }
+}
+
+setupPublication()
+
+tasks {
+    getByName("JsJar", Jar::class) {
+        from("${rootProject.buildDir}/js/packages/kvision-${project.name}/package.json")
+    }
+}
diff --git a/kvision-modules/kvision-redux/package.json.d/project.info b/kvision-modules/kvision-redux/package.json.d/project.info
deleted file mode 100644
index f4189f6f..00000000
--- a/kvision-modules/kvision-redux/package.json.d/project.info
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "description": "KVision Redux module"
-}
diff --git a/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt b/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
index 474206fc..2c6cb1e9 100644
--- a/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
+++ b/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
@@ -80,7 +80,12 @@ class ReduxStore<S : Any, A : RAction>(
             },
             initialState,
             @Suppress("SpreadOperator")
-            KVManagerRedux.compose(KVManagerRedux.applyMiddleware(KVManagerRedux.reduxThunk, *middlewares), rEnhancer())
+            (KVManagerRedux.compose(
+                KVManagerRedux.applyMiddleware<S, RAction, WrapperAction, Any, Any>(
+                    KVManagerRedux.reduxThunk,
+                    *middlewares
+                ), rEnhancer()
+            )).asDynamic()
         )
     }
 
diff --git a/kvision-modules/kvision-redux/webpack.config.d/bootstrap.js b/kvision-modules/kvision-redux/webpack.config.d/bootstrap.js
new file mode 100644
index 00000000..35b28e6a
--- /dev/null
+++ b/kvision-modules/kvision-redux/webpack.config.d/bootstrap.js
@@ -0,0 +1,3 @@
+config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'});
+config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'});
+config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'});
diff --git a/kvision-modules/kvision-redux/webpack.config.d/file.js b/kvision-modules/kvision-redux/webpack.config.d/file.js
new file mode 100644
index 00000000..653ca21f
--- /dev/null
+++ b/kvision-modules/kvision-redux/webpack.config.d/file.js
@@ -0,0 +1,9 @@
+config.module.rules.push(
+    {
+        test: /\.(jpe?g|png|gif|svg)$/i,
+        loader: 'file-loader',
+        options: {
+              esModule: false,
+        },
+    }
+);
-- 
cgit