Created
April 6, 2017 15:02
-
-
Save joshskeen/1d4c8813ffb1685d556e3f9a799af0cd to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/build.gradle b/app/build.gradle | |
index c879b5f..4146e33 100644 | |
--- a/app/build.gradle | |
+++ b/app/build.gradle | |
@@ -1,9 +1,9 @@ | |
apply plugin: 'com.android.application' | |
-apply plugin: 'me.tatarka.retrolambda' | |
+apply plugin: 'kotlin-android' | |
android { | |
compileSdkVersion 25 | |
- buildToolsVersion "25.0.0" | |
+ buildToolsVersion "25.0.2" | |
defaultConfig { | |
applicationId "com.bignerdranch.stockwatcher" | |
minSdkVersion 19 | |
@@ -18,34 +18,31 @@ android { | |
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | |
} | |
} | |
- compileOptions { | |
- sourceCompatibility JavaVersion.VERSION_1_8 | |
- targetCompatibility JavaVersion.VERSION_1_8 | |
- } | |
- dataBinding { | |
- enabled = true | |
- } | |
+ dataBinding.enabled = true | |
} | |
dependencies { | |
- compile fileTree(dir: 'libs', include: ['*.jar']) | |
+ compile fileTree(include: ['*.jar'], dir: 'libs') | |
//support libraries | |
- compile 'com.android.support:appcompat-v7:25.1.0' | |
- compile 'com.android.support:design:25.1.0' | |
+ compile 'com.android.support:appcompat-v7:25.3.0' | |
+ compile 'com.android.support:design:25.3.0' | |
//dependency injection | |
compile 'com.google.dagger:dagger:2.8' | |
- annotationProcessor 'com.google.dagger:dagger-compiler:2.8' | |
+ kapt 'com.google.dagger:dagger-compiler:2.8' | |
+ kapt "com.android.databinding:compiler:$gradle_plugin_version" | |
provided 'org.glassfish:javax.annotation:10.0-b28' | |
compile 'com.google.auto.factory:auto-factory:1.0-beta3' | |
- //code generation | |
- provided 'org.projectlombok:lombok:1.16.12' | |
- annotationProcessor 'org.projectlombok:lombok:1.16.12' | |
- //networking | |
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' | |
compile 'io.reactivex.rxjava2:rxandroid:2.0.1' | |
compile 'com.squareup.okhttp3:logging-interceptor:3.4.2' | |
- compile 'com.squareup.retrofit2:converter-gson:2.1.0' | |
+ compile "com.squareup.retrofit2:converter-moshi:2.0.0" | |
//logging | |
compile 'com.jakewharton.timber:timber:4.3.1' | |
+ compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" | |
+} | |
+ | |
+kapt.generateStubs = true | |
+repositories { | |
+ mavenCentral() | |
} | |
diff --git a/build.gradle b/build.gradle | |
index 2eb7fe4..d473a97 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -1,14 +1,14 @@ | |
// Top-level build file where you can add configuration options common to all sub-projects/modules. | |
buildscript { | |
+ ext.kotlin_version = '1.1.1' | |
+ ext.gradle_plugin_version = '2.3.0' | |
repositories { | |
jcenter() | |
} | |
dependencies { | |
- classpath 'com.android.tools.build:gradle:2.3.0-beta3' | |
- classpath 'me.tatarka:gradle-retrolambda:3.4.0' | |
- // NOTE: Do not place your application dependencies here; they belong | |
- // in the individual module build.gradle files | |
+ classpath "com.android.tools.build:gradle:$gradle_plugin_version" | |
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
} | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment