Updated project to use latest versions of the tools including migration into kotlin

Author: achmyr

Diff for: app/build.gradle

@@ -1,24 +1,50 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "acm.androidfitnesseexample"
-        minSdkVersion 24
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-}
+    implementation 'org.fitnesse:fitnesse:20200501'
+
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+}

Diff for: app/src/androidTest/java/acm/androidfitnesseexample/ApplicationTest.java

@@ -0,0 +1,28 @@
+package acm.androidfitnesseexample
+
+import android.app.Application
+import fitnesse.slim.JavaSlimFactory
+import fitnesse.slim.SlimService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import java.io.IOException
+
+class AndroidFitnesseExampleApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        launchFitnesseServer()
+    }
+
+    private fun launchFitnesseServer() {
+        val options = SlimService.parseCommandLine(arrayOf("-v", "-d", "8099"))
+        GlobalScope.launch {
+            try {
+                SlimService.startWithFactory(JavaSlimFactory.createJavaSlimFactory(options), options)
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+    }
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/AndroidFitnesseExampleApplication.java

@@ -0,0 +1,20 @@
+package acm.androidfitnesseexample
+
+import android.app.Activity
+import android.os.Bundle
+import android.widget.TextView
+
+class DefaultActivity : Activity(), MessageInterface {
+
+    private var mMessage: TextView? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_default)
+        mMessage = findViewById(R.id.message)
+    }
+
+    override fun showMessage(text: String) {
+        mMessage!!.text = text
+    }
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/AndroidFitnesseExampleApplication.kt

@@ -0,0 +1,5 @@
+package acm.androidfitnesseexample
+
+interface MessageInterface {
+    fun showMessage(text: String)
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/DefaultActivity.java

@@ -0,0 +1,15 @@
+package acm.androidfitnesseexample
+
+class MessagePresenter(private val mMessageInterface: MessageInterface) {
+    private var mText: String? = null
+    fun read(text: String?) {
+        mText = text
+    }
+
+    fun produceAnswer() {
+        mText?.let {
+            mMessageInterface.showMessage(it)
+        }
+    }
+
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/DefaultActivity.kt

@@ -0,0 +1,28 @@
+package fixtures
+
+import acm.androidfitnesseexample.MessageInterface
+import acm.androidfitnesseexample.MessagePresenter
+
+class SayHelloFixture : MessageInterface {
+
+    private var mMessage: String? = null
+
+    private val mMessagePresenter: MessagePresenter = MessagePresenter(this)
+
+    fun iSay(text: String?) {
+        mMessagePresenter.read(text)
+    }
+
+    fun waitingForAnswer() {
+        mMessagePresenter.produceAnswer()
+    }
+
+    fun answer(): String? {
+        return mMessage
+    }
+
+    override fun showMessage(text: String) {
+        mMessage = text
+    }
+
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/MessageInterface.java

@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
+    ext.kotlin_version = "1.3.72"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0-alpha10'
+        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,5 +18,9 @@ allprojects {
     repositories {
         google()
         jcenter()
-    }
+     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

Diff for: app/src/main/java/acm/androidfitnesseexample/MessageInterface.kt

@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.useAndroidX=true

Diff for: app/src/main/java/acm/androidfitnesseexample/MessagePresenter.java

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-milestone-1-all.zip