Skip to content

Commit

Permalink
Merge branch 'master-kotlin' of github.com:vestrel00/android-dagger-b…
Browse files Browse the repository at this point in the history
…utterknife-mvp into master-support-kotlin. Closes #62
  • Loading branch information
vestrel00 committed Feb 2, 2018
2 parents d44d7c2 + fe16fb9 commit 7da9060
Show file tree
Hide file tree
Showing 93 changed files with 1,682 additions and 1,920 deletions.
15 changes: 12 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 26
Expand All @@ -31,6 +33,11 @@ android {
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
}

sourceSets {
// May no longer be needed in future versions of Android Studio or the Kotlin Gradle plugin?
main.java.srcDirs += 'src/main/kotlin'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
Expand All @@ -43,14 +50,16 @@ dependencies {
def daggerVersion = '2.14'
def butterKnifeVersion = '8.8.0'
def supportVersion = '26.0.1'
def kotlinVersion = '1.2.0'

annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
annotationProcessor "com.google.dagger:dagger-android-processor:$daggerVersion"
annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"

compile "com.google.dagger:dagger:$daggerVersion"
compile "com.google.dagger:dagger-android:$daggerVersion"
compile "com.google.dagger:dagger-android-support:$daggerVersion"
compile "com.jakewharton:butterknife:$butterKnifeVersion"
compile "com.android.support:appcompat-v7:$supportVersion"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
}
52 changes: 0 additions & 52 deletions app/src/main/java/com/vestrel00/daggerbutterknifemvp/App.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7da9060

Please sign in to comment.