Update to newest version of tools

- robolectric 3.0
- kotlin 1.0.1
- delete espresso tests
- collapse into single gradle project

Author: joerodriguez

.DS_Store

@@ -1,14 +1,19 @@
 # Android Example  Kotlin
-An example of basic Android application setup using Kotlin. It can run Robolectric and Espresso tests.
+An example of basic Android application setup using Kotlin, including Robolectric tests.
 
 This is an example built from the three following sources
 
  *  [Deckard Gradle](https://github.com/robolectric/deckard-gradle) (from the Robolectric team)
-    demonstrates the base structure for running Robolectric tests and Espresso tests through gradle.
+    demonstrates the base structure for running Robolectric tests through gradle.
  *  [tests-app-robolectric-junit](https://github.com/blundell/tests-app-robolectric-junit) (by Paul Blundell)
     demonstrates how to use a components based structure in order to make Robolectric tests well supported by Android Studio.
  *  [Kotlin Android Tutorial](http://kotlinlang.org/docs/tutorials/kotlin-android.html)
     On how to convert the existing Java sctructure to Kotlin.
 
 I haven't done any extra work on making the code nicer using Kotlin.
 This project is just a nice minimal starter for any android project using Kotlin and Robolectric.
+
+
+## Setup
+
+Use Android Studio

README.md

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '0.11.91.4'
+    ext.kotlin_version = '1.0.1-1'
 
     repositories {
         mavenLocal()
@@ -10,13 +10,46 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-subprojects {
-    repositories {
-        mavenCentral()
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+repositories {
+    mavenCentral()
+}
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 23
+        versionCode 2
+        versionName "1.0.0-SNAPSHOT"
+        applicationId "com.example"
     }
+
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
+
+
+    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+
+    testCompile "junit:junit:4.12"
+    testCompile "org.hamcrest:hamcrest-core:1.1"
+    testCompile "org.hamcrest:hamcrest-library:1.1"
+    testCompile "org.hamcrest:hamcrest-integration:1.1"
+
+    testCompile "org.robolectric:robolectric:3.0"
+
 }

application/build.gradle

@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sat May 09 07:27:13 MDT 2015
-sdk.dir=/Users/dam5s/Library/Android/sdk
+#Thu Mar 24 14:24:26 MDT 2016
+sdk.dir=/Users/josephrodriguez/Library/Android/sdk

application/src/androidTest/kotlin/ExampleEspressoTest.kt

@@ -1,4 +1 @@
 rootProject.name = "android-example"
-
-include "application"
-include "robolectric-tests"

application/src/main/kotlin/extensions/ButterKnife.kt

@@ -3,9 +3,9 @@
           package="com.example">
 
     <application
-        android:name=".ExampleApplication"
+        android:name="com.example.ExampleApplication"
         android:allowBackup="true">
-        <activity android:name="com.example.login.LoginActivity" android:screenOrientation="portrait">
+        <activity android:name=".login.LoginActivity" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

application/src/main/kotlin/tasks/Promise.kt

@@ -2,4 +2,4 @@ package com.example
 
 import android.app.Application
 
-public class ExampleApplication : Application()
+class ExampleApplication : Application()

build.gradle

@@ -0,0 +1,5 @@
+package com.example
+
+class Promise<T> {
+
+}

local.properties

@@ -1,12 +1,12 @@
 package com.example.api
 
-import com.example.tasks.Promise
+import com.example.Promise
 
-trait ApiGateway {
+interface ApiGateway {
     fun <T: ApiResponse> doRequest(request: ApiRequest<T>): Promise<T>
 }
 
-trait ApiRequest<T: ApiResponse> {
+interface ApiRequest<T: ApiResponse> {
     val method: ApiMethod
     val body: Any?
 
@@ -17,12 +17,12 @@ trait ApiRequest<T: ApiResponse> {
     fun buildResponse(): T
 }
 
-trait ApiResponse {
+interface ApiResponse {
 }
 
 enum class ApiMethod {
-    GET
-    POST
-    PUT
+    GET,
+    POST,
+    PUT,
     DELETE
 }

robolectric-tests/build.gradle

@@ -1,6 +1,6 @@
 package com.example.api
 
-import com.example.tasks.Promise
+import com.example.Promise
 
 class HttpApiGateway: ApiGateway {
     override fun <T : ApiResponse> doRequest(request: ApiRequest<T>): Promise<T> {