Multiplatform build

Kotlin · Jan 17, 2017 · 4ad3daf · 4ad3daf
1 parent a304b1d
commit 4ad3daf
Show file tree

Hide file tree

Showing 22 changed files with 305 additions and 356 deletions.
diff --git a/js/pom.xml b/js/pom.xml
@@ -18,14 +18,6 @@
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx.html.shared</artifactId>
             <version>${project.version}</version>
-            <classifier>js</classifier>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
@@ -47,6 +39,7 @@
                             <moduleKind>umd</moduleKind>
                             <sourceMap>true</sourceMap>
                             <outputFile>${project.build.outputDirectory}/${project.artifactId}.js</outputFile>
+                            <multiPlatform>true</multiPlatform>
                         </configuration>
                     </execution>
                     <execution>
@@ -60,6 +53,7 @@
                             <metaInfo>true</metaInfo>
                             <sourceMap>true</sourceMap>
                             <moduleKind>umd</moduleKind>
+                            <multiPlatform>true</multiPlatform>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/js/src/main/kotlin/dom.kt b/js/src/main/kotlin/dom.kt
@@ -100,8 +100,8 @@ class JSDOMBuilder<out R : HTMLElement>(val document : Document) : TagConsumer<R
 }
 
 
-fun Document.createTree() : TagConsumer<HTMLElement> = JSDOMBuilder(this)
-val Document.create : TagConsumer<HTMLElement>
+ fun Document.createTree() : TagConsumer<HTMLElement> = JSDOMBuilder(this)
+ val Document.create : TagConsumer<HTMLElement>
     get() = JSDOMBuilder(this)
 
 fun Node.append(block : TagConsumer<HTMLElement>.() -> Unit) : List<HTMLElement> =

diff --git a/js/src/main/kotlin/injector.kt b/js/src/main/kotlin/injector.kt
@@ -25,7 +25,7 @@ interface CustomCapture : InjectCapture {
 
 class InjectorConsumer<out T: Any>(val downstream : TagConsumer<HTMLElement>, val bean : T, rules : List<Pair<InjectCapture, KMutableProperty1<T, out HTMLElement>>>) : TagConsumer<HTMLElement> by downstream {
 
-    private val classesMap = rules
+    private val classesMap: Map<String, List<KMutableProperty1<T, out HTMLElement>>> = rules
             .filter { it.first is InjectByClassName }
             .map { it.first as InjectByClassName to it.second }
             .groupBy ({ it.first.className }, { it.second })
@@ -71,6 +71,7 @@ class InjectorConsumer<out T: Any>(val downstream : TagConsumer<HTMLElement>, va
 }
 
 fun <T: Any> TagConsumer<HTMLElement>.inject(bean : T, rules : List<Pair<InjectCapture, KMutableProperty1<T, out HTMLElement>>>) : TagConsumer<HTMLElement> = InjectorConsumer(this, bean, rules)
+
 fun <T: Any> HTMLElement.appendAndInject(bean : T, rules : List<Pair<InjectCapture, KMutableProperty1<T, out HTMLElement>>>, block : TagConsumer<HTMLElement>.() -> Unit) : List<HTMLElement> = append {
     InjectorConsumer(this@append, bean, rules).block()
     Unit

diff --git a/js/src/main/kotlin/trace.kt b/js/src/main/kotlin/trace.kt
@@ -0,0 +1,5 @@
+package kotlinx.html.consumers
+
+import kotlinx.html.*
+
+fun <R> TagConsumer<R>.trace() : TagConsumer<R> = trace(println = { console.info(it) })
diff --git a/js/src/main/kotlin/utilsImpl.kt b/js/src/main/kotlin/utilsImpl.kt
@@ -0,0 +1,3 @@
+package kotlinx.html
+
+impl fun currentTimeMillis(): Long = Date().getTime().toLong()
diff --git a/js/src/test/karma/karma.conf.js b/js/src/test/karma/karma.conf.js
@@ -19,8 +19,7 @@ module.exports = function (config) {
             reporters: ['progress', 'junit'],
             files: [
                 '../../../target/test-js/kotlin.js',
-                '../../../../shared/target/js/*.js',
-                '../../../target/classes/*.js',
+		'../../../target/classes/*.js',
                 '../../../target/test-js/*.js'
             ],
             exclude: [],
@@ -45,4 +44,4 @@ module.exports = function (config) {
             }
         }
     )
-};
+};