From be8dce818e27dbbf5aeca2e5e225435a4ae0794b Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 29 Nov 2018 20:17:25 -0600 Subject: [PATCH] Rearrange Gradle libraries. --- app/build.gradle | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aad8879..8f36233 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,10 @@ android { } dependencies { + def lifecycle_version = "2.0.0" + def room_version = "2.1.0-alpha02" + def paging_version = "2.1.0-beta01" + implementation fileTree(dir: 'libs', include: ['*.jar']) //androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', { @@ -72,16 +76,12 @@ dependencies { } implementation 'com.jaredrummler:material-spinner:1.2.5' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - //testCompile 'com.android.support.test:runner:1.0.1' implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.android.material:material:1.1.0-alpha01' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - implementation 'androidx.paging:paging-runtime:2.1.0-beta01' implementation 'com.idescout.sql:sqlscout-server:2.0' implementation 'com.google.code.gson:gson:2.8.4' implementation 'com.squareup.retrofit2:retrofit:2.2.0' @@ -100,14 +100,13 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0' implementation 'de.hdodenhof:circleimageview:2.2.0' - //testCompile 'junit:junit: 4.12' - testImplementation 'org.mockito:mockito-core:2.19.0' - implementation 'androidx.room:room-runtime:2.1.0-alpha02' + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" + kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" - kapt 'androidx.room:room-runtime:2.1.0-alpha02' - kapt 'androidx.room:room-compiler:2.1.0-alpha02' + implementation "androidx.room:room-runtime:$room_version" + kapt "androidx.room:room-compiler:$room_version" - kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0' + implementation "androidx.paging:paging-runtime:$paging_version" implementation 'com.github.esafirm.android-image-picker:imagepicker:1.11.1' implementation 'id.zelory:compressor:2.1.0' @@ -129,5 +128,9 @@ dependencies { implementation 'com.google.zxing:core:3.3.1' implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' + testImplementation 'org.testng:testng:6.9.6' + testImplementation 'org.mockito:mockito-core:2.19.0' + //testCompile 'junit:junit: 4.12' + //testCompile 'com.android.support.test:runner:1.0.1' }