Merge function-builder branch into master

build.gradle.kts

@@ -1,59 +1,83 @@
 plugins {
-    kotlin("multiplatform") version "1.3.70-eap-184"
+    kotlin("multiplatform") version "1.4.32"
+    `maven-publish`
 }
 
 group = "nl.astraeus"
-version = "0.1.0-SNAPSHOT"
+version = "0.4.19"
 
 repositories {
     maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
+    mavenLocal()
     mavenCentral()
 }
 
-apply(plugin = "kotlin-dce-js")
-
 kotlin {
-    /* Targets configuration omitted. 
-    *  To find out how to configure the targets, please follow the link:
-    *  https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#setting-up-targets */
     jvm()
-    js()
-
-    sourceSets {
-        val commonMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-
-                implementation("io.github.microutils:kotlin-logging-common:1.7.8")
+    js(BOTH) {
+        browser {
+            testTask {
+                useKarma {
+                    useFirefox()
+                    //useChrome()
+                }
             }
         }
+    }
+
+    sourceSets {
+        val commonMain by getting {}
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
-                //implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test-annotations-common"))
             }
         }
-        val jsMain by getting {
+        val jvmTest by getting {
             dependencies {
-                implementation(kotlin("stdlib-js"))
-
-                implementation("io.github.microutils:kotlin-logging-js:1.7.8")
+                implementation(kotlin("test-junit"))
             }
         }
         val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))
-                //implementation(kotlin("test-annotations-js"))
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-
-                implementation("org.slf4j:slf4j-api:1.7.29")
-                implementation("org.slf4j:slf4j-simple:1.7.29")
-                implementation("io.github.microutils:kotlin-logging:1.7.8")
             }
         }
     }
 }
+
+publishing {
+    repositories {
+        maven {
+            name = "releases"
+            // change to point to your repo, e.g. http://my.org/repo
+            url = uri("http://nexus.astraeus.nl/nexus/content/repositories/releases")
+            credentials {
+                val nexusUsername: String by project
+                val nexusPassword: String by project
+
+                username = nexusUsername
+                password = nexusPassword
+            }
+        }
+        maven {
+            name = "snapshots"
+            // change to point to your repo, e.g. http://my.org/repo
+            url = uri("http://nexus.astraeus.nl/nexus/content/repositories/snapshots")
+            credentials {
+                val nexusUsername: String by project
+                val nexusPassword: String by project
+
+                username = nexusUsername
+                password = nexusPassword
+            }
+        }
+    }
+/*
+    publications {
+        val kotlinMultiplatform by getting {
+            artifactId = "kotlin-css-generator"
+        }
+    }
+*/
+}