Browser JS, JVM, Android is working with 1.2-Beta

Author: wojta

build.gradle

@@ -12,12 +12,16 @@ buildscript {
         maven {
             url 'http://oss.sonatype.org/content/repositories/snapshots'
         }
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.jtransc:jtransc-gradle-plugin:$jtranscVersion"
+        classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
     }
 }
 

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx4608M

hello_android/src/main/res/layout/activity_main.xml

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-
 android {
     compileSdkVersion 26
     buildToolsVersion "26.0.1"
@@ -25,6 +24,10 @@ android {
         abortOnError false
     }
 
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+
 }
 
 def anko_version = "0.10.1"
@@ -33,9 +36,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.anko:anko:$anko_version"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.19"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.19"
-    compile project(":hello_java")
+    compile "org.jetbrains.anko:anko-coroutines:$anko_version"
+    compile project(':hello_lib_jvm')
 }
 

hello_android/.gitignore renamed to hello_android_app/.gitignore

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cz.sazel.hellokotlin" >
+          package="cz.sazel.hellokotlin">
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
-        <activity android:name=".MainActivity" >
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>

hello_android/build.gradle renamed to hello_android_app/build.gradle

@@ -5,7 +5,8 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.TextView
-import cz.sazel.hellokotlin.console.Console
+import cz.sazel.hellokotlin.console.AndroidConsole
+import cz.sazel.hellokotlin.console.IConsole
 import cz.sazel.hellokotlin.Math
 import cz.sazel.hellokotlin.SharedClass
 import org.jetbrains.anko.coroutines.experimental.*
@@ -20,23 +21,23 @@ class MainActivity : AppCompatActivity() {
 
     lateinit var sharedClass: SharedClass
 
-    lateinit private var console: Console
+    lateinit private var console: IConsole
 
     protected override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        tvConsole.setOnClickListener { startClick(it) }
-        console = Console(tvConsole)
+        btStart.setOnClickListener { startClick(it) }
+        console = AndroidConsole(tvConsole)
         sharedClass = SharedClass(console, Math())
-        sharedClass.text = "Android"
+        sharedClass.platform = "Android"
     }
 
     protected fun startClick(v: View) {
         sharedClass.printMe()
         //we can't have direct sharedClass.printPrimes(1000) there, we need to do it asynchronously to not block the UI
         async(UI) {
             val primes: Deferred<List<Long>> = bg {
-                sharedClass.calcPrimes(1000);
+                return@bg sharedClass.calcPrimes(1000);
             }
             val output = primes.await().map { prime -> prime.toString() }.reduce { s1, s2 -> s1 + "\n" + s2 }
             console.println(output)

hello_android/proguard-rules.pro renamed to hello_android_app/proguard-rules.pro

@@ -5,7 +5,7 @@ import android.widget.TextView
 /**
  * Created by wojta on 22.12.15.
  */
-class Console(val textView: TextView) : IConsole {
+class AndroidConsole(val textView: TextView) : IConsole {
     override fun println(s: String) {
         textView.text = textView.text.toString() + s + "\n"
     }