Update Kotlin version and add proper Room and Paging libreries.
This commit is contained in:
parent
a816098be8
commit
f04708bde1
2 changed files with 17 additions and 8 deletions
|
@ -1,8 +1,7 @@
|
||||||
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'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 28
|
compileSdkVersion 28
|
||||||
|
@ -23,6 +22,9 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
def lifecycle_version = "2.0.0"
|
||||||
|
def room_version = "2.1.0-alpha02"
|
||||||
|
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation project(':graphenejlib:graphenej')
|
implementation project(':graphenejlib:graphenej')
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
@ -30,10 +32,17 @@ dependencies {
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
|
||||||
implementation 'com.google.android.material:material:1.0.0'
|
implementation 'com.google.android.material:material:1.0.0'
|
||||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||||
implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
|
|
||||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
|
|
||||||
|
|
||||||
testImplementation 'junit:junit:4.12'
|
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
|
||||||
androidTestImplementation 'androidx.test:runner:1.1.0'
|
kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
|
|
||||||
|
implementation "androidx.room:room-runtime:$room_version"
|
||||||
|
kapt "androidx.room:room-compiler:$room_version"
|
||||||
|
|
||||||
|
// TODO enable and make proper testing
|
||||||
|
// testImplementation 'junit:junit:4.12'
|
||||||
|
// testImplementation "androidx.arch.core:core-testing:$lifecycle_version"
|
||||||
|
// testImplementation "androidx.room:room-testing:$room_version"
|
||||||
|
// androidTestImplementation 'androidx.test:runner:1.1.0'
|
||||||
|
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.2.71'
|
ext.kotlin_version = '1.3.0'
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
Loading…
Reference in a new issue