Merge pull request dam5s#2 from joerodriguez/master

Simplify build and use Dagger2 for DI

Author: dam5s

Diff for: .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

Diff for: README.md

@@ -1,22 +1,65 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+repositories {
+    mavenCentral()
+}
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 21
+        versionCode 2
+        versionName "1.0.0-SNAPSHOT"
+        applicationId "com.example"
+    }
+}
+
+kapt {
+    generateStubs = true
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:recyclerview-v7:21.0.3'
+
+    compile 'com.google.dagger:dagger:2.0'
+    kapt 'com.google.dagger:dagger-compiler:2.0'
+    provided 'org.glassfish:javax.annotation:10.0-b28'
+
+
+    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"
+    testCompile "org.mockito:mockito-core:1.9.5"
+}
+
 buildscript {
-    ext.kotlin_version = '0.11.91.4'
+    ext.kotlin_version = '1.0.1-1'
 
     repositories {
         mavenLocal()
         mavenCentral()
         maven {
             url "https://repo1.maven.org/maven2"
         }
+        maven {
+            url 'http://oss.sonatype.org/content/repositories/snapshots'
+        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
-
-subprojects {
-    repositories {
-        mavenCentral()
-    }
-}

Diff for: 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

Diff for: application/src/androidTest/kotlin/ExampleEspressoTest.kt

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

Diff for: application/src/main/kotlin/ExampleApplication.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"/>