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-fontawesome/build.gradle   |  9 -----
 .../kvision-fontawesome/build.gradle.kts           | 46 ++++++++++++++++++++++
 .../package.json.d/project.info                    |  3 --
 .../webpack.config.d/bootstrap.js                  |  1 -
 .../kvision-fontawesome/webpack.config.d/file.js   |  9 +++++
 .../kvision-fontawesome/webpack.config.d/jquery.js | 14 ++++---
 6 files changed, 64 insertions(+), 18 deletions(-)
 delete mode 100644 kvision-modules/kvision-fontawesome/build.gradle
 create mode 100644 kvision-modules/kvision-fontawesome/build.gradle.kts
 delete mode 100644 kvision-modules/kvision-fontawesome/package.json.d/project.info
 create mode 100644 kvision-modules/kvision-fontawesome/webpack.config.d/file.js

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

diff --git a/kvision-modules/kvision-fontawesome/build.gradle b/kvision-modules/kvision-fontawesome/build.gradle
deleted file mode 100644
index 3df8b70e..00000000
--- a/kvision-modules/kvision-fontawesome/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-apply from: "../shared.gradle"
-
-kotlinFrontend {
-
-    npm {
-        dependency("@fortawesome/fontawesome-free", "5.12.0")
-    }
-
-}
diff --git a/kvision-modules/kvision-fontawesome/build.gradle.kts b/kvision-modules/kvision-fontawesome/build.gradle.kts
new file mode 100644
index 00000000..31231570
--- /dev/null
+++ b/kvision-modules/kvision-fontawesome/build.gradle.kts
@@ -0,0 +1,46 @@
+buildscript {
+    extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true")
+}
+
+plugins {
+    kotlin("js")
+    id("maven-publish")
+}
+
+repositories()
+
+kotlin {
+    kotlinJsTargets()
+}
+
+dependencies {
+    implementation(kotlin("stdlib-js"))
+    api(rootProject)
+    implementation(npm("@fortawesome/fontawesome-free", "5.12.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-fontawesome/package.json.d/project.info b/kvision-modules/kvision-fontawesome/package.json.d/project.info
deleted file mode 100644
index 0801ee7b..00000000
--- a/kvision-modules/kvision-fontawesome/package.json.d/project.info
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "description": "KVision Font Awesome module"
-}
diff --git a/kvision-modules/kvision-fontawesome/webpack.config.d/bootstrap.js b/kvision-modules/kvision-fontawesome/webpack.config.d/bootstrap.js
index 32a7c4d0..35b28e6a 100644
--- a/kvision-modules/kvision-fontawesome/webpack.config.d/bootstrap.js
+++ b/kvision-modules/kvision-fontawesome/webpack.config.d/bootstrap.js
@@ -1,4 +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'});
-config.module.rules.push({test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'});
diff --git a/kvision-modules/kvision-fontawesome/webpack.config.d/file.js b/kvision-modules/kvision-fontawesome/webpack.config.d/file.js
new file mode 100644
index 00000000..653ca21f
--- /dev/null
+++ b/kvision-modules/kvision-fontawesome/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,
+        },
+    }
+);
diff --git a/kvision-modules/kvision-fontawesome/webpack.config.d/jquery.js b/kvision-modules/kvision-fontawesome/webpack.config.d/jquery.js
index bf5a1a20..e6c6b219 100644
--- a/kvision-modules/kvision-fontawesome/webpack.config.d/jquery.js
+++ b/kvision-modules/kvision-fontawesome/webpack.config.d/jquery.js
@@ -1,5 +1,9 @@
-config.plugins.push(new webpack.ProvidePlugin({
-    $: "jquery",
-    jQuery: "jquery",
-    "window.jQuery": "jquery"
-}));
+;(function() {
+    const webpack = require('webpack')
+
+    config.plugins.push(new webpack.ProvidePlugin({
+	$: "jquery",
+	jQuery: "jquery",
+	"window.jQuery": "jquery"
+    }));
+})();
-- 
cgit