Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
hvarona 2018-09-29 20:52:26 -04:00
commit e9a147e344
2 changed files with 4 additions and 2 deletions

View file

@ -1,6 +1,8 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' // add this line
kapt { kapt {
generateStubs = true generateStubs = true

View file

@ -8,9 +8,9 @@ buildscript {
} }
ext.kotlin_version = '1.2.51' ext.kotlin_version = '1.2.51'
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.60" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.51"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }