Add Kotlin for tests

luebke-b1 · Sep 7, 2017 · 22e0649 · 22e0649
1 parent 27c4c94
commit 22e0649
Show file tree

Hide file tree

Showing 8 changed files with 370 additions and 404 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+kotlinVersion=1.1.4-3
 androidCompileSdkVersion=25
 androidBuildToolsVersion=25.0.2
 androidSupportLibraryVersion=25.2.0
@@ -7,3 +8,4 @@ robolectricVersion=3.2.2
 junitVersion=4.12
 mockitoVersion=1.10.19
 okioVersion=1.11.0
+truthVersion=0.35
diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 if (!rootProject.optimizeForDevelopment) {
     apply from: '../gradle/plugins/checkstyle-android.gradle'
@@ -25,9 +26,11 @@ dependencies {
     androidTestCompile 'com.android.support.test:runner:0.4.1'
     androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0'
 
+    testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}"
     testCompile "com.squareup.okio:okio:${okioVersion}"
     testCompile "org.robolectric:robolectric:${robolectricVersion}"
     testCompile "junit:junit:${junitVersion}"
+    testCompile "com.google.truth:truth:${truthVersion}"
     testCompile "org.mockito:mockito-core:${mockitoVersion}"
 }
 

diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/MessageTest.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ buildscript { @@
         dependencies {
             classpath 'com.android.tools.build:gradle:2.3.0'
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
         }
     }
@@ Expand Down @@