From 2b851e78875c876496da205cced5542b293ec356 Mon Sep 17 00:00:00 2001
From: rnentjes <info@nentjes.com>
Date: Wed, 4 Mar 2020 22:36:41 +0100
Subject: [PATCH] Update kotlin, use umd

---
 build.gradle  |  4 +++-
 komp.iml      |  2 +-
 komp.ipr      |  6 ++++++
 komp_main.iml |  6 +++---
 komp_test.iml | 11 +++++------
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1b4d5c7..eb5b122 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,8 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 group 'nl.astraeus'
-version '0.1.16-SNAPSHOT'
+version '0.1.17-SNAPSHOT'
+/*
 
 kotlin {
     target {
@@ -33,6 +34,7 @@ kotlin {
 }
 
 compileKotlinJs.kotlinOptions.moduleKind = "umd"
+*/
 
 idea {
     module {
diff --git a/komp.iml b/komp.iml
index 9bacbca..22881c0 100644
--- a/komp.iml
+++ b/komp.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="0.1.16-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="0.1.17-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false">
diff --git a/komp.ipr b/komp.ipr
index e47b9ec..503d6d5 100644
--- a/komp.ipr
+++ b/komp.ipr
@@ -7,6 +7,12 @@
         <element id="module-output" name="komp_main" />
       </root>
     </artifact>
+    <artifact type="jar" name="komp-0.1.17-SNAPSHOT">
+      <output-path>$PROJECT_DIR$/build/libs</output-path>
+      <root id="archive" name="komp-0.1.17-SNAPSHOT.jar">
+        <element id="module-output" name="komp_main" />
+      </root>
+    </artifact>
   </component>
   <component name="CheckStyle-IDEA">
     <option name="configuration">
diff --git a/komp_main.iml b/komp_main.iml
index a31b333..c3b60db 100644
--- a/komp_main.iml
+++ b/komp_main.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.1.16-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.1.17-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/test/kotlin;/home/rnentjes/Development/komp/komp/src/main/kotlin">
         <newMppModelJpsModuleKind>COMPILATION_AND_SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <compilerSettings />
         <compilerArguments>
-          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp/kotlin/komp.js" />
+          <option name="outputFile" value="$MODULE_DIR$/build/classes/kotlin/main/komp.js" />
           <option name="noStdlib" value="true" />
           <option name="sourceMap" value="true" />
           <option name="metaInfo" value="true" />
@@ -30,7 +30,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/js/packages/komp/kotlin" />
+    <output url="file://$MODULE_DIR$/build/classes/kotlin/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/src/main/kotlin">
       <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" type="kotlin-source" />
diff --git a/komp_test.iml b/komp_test.iml
index a3a0c2d..65742cb 100644
--- a/komp_test.iml
+++ b/komp_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.1.16-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.1.17-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/test/kotlin;/home/rnentjes/Development/komp/komp/src/main/kotlin">
@@ -7,10 +7,9 @@
           <sourceSet>komp_main</sourceSet>
         </sourceSets>
         <newMppModelJpsModuleKind>COMPILATION_AND_SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
-        <externalSystemTestTasks>browserTest|komp:test|Js</externalSystemTestTasks>
         <compilerSettings />
         <compilerArguments>
-          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp-test/kotlin/komp-test.js" />
+          <option name="outputFile" value="$MODULE_DIR$/build/classes/kotlin/test/komp_test.js" />
           <option name="noStdlib" value="true" />
           <option name="sourceMap" value="true" />
           <option name="metaInfo" value="true" />
@@ -34,7 +33,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/build/js/packages/komp-test/kotlin" />
+    <output-test url="file://$MODULE_DIR$/build/classes/kotlin/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/src/test/kotlin" />
     <content url="file://$MODULE_DIR$/src/test/resources" />
@@ -56,7 +55,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/build/js/packages/komp/kotlin" />
+          <root url="file://$MODULE_DIR$/build/classes/kotlin/main" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,7 +64,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/build/js/packages/komp/kotlin" />
+          <root url="file://$MODULE_DIR$/build/classes/kotlin/main" />
           <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.3.70/41513becdc85a89799b74028a81c39c364ba3465/kotlin-stdlib-js-1.3.70.jar!/" />
           <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-js/0.7.1/f3a744916effcbe728d38e4bfd732f9694d18fa9/kotlinx-html-js-0.7.1.jar!/" />
           <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.70/3fa8dd6c896d635e78201e5e811545f3846dec04/kotlin-stdlib-common-1.3.70.jar!/" />