From d3ebcc14ec6f17c22a5d1deed15aa613e171acc1 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Wed, 6 Nov 2019 20:48:58 +0100 Subject: [PATCH] update deps, cleanup build file (#1546) --- app/build.gradle | 135 +++++++++++++++++++++++++---------------------- build.gradle | 2 +- 2 files changed, 73 insertions(+), 64 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4abeb015..36088c27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt' apply from: "../instance-build.gradle" -def getGitSha = { -> +def getGitSha = { def stdout = new ByteArrayOutputStream() exec { commandLine 'git', 'rev-parse', '--short', 'HEAD' @@ -63,9 +63,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - androidExtensions { - experimental = true - } testOptions { unitTests { returnDefaultValues = true @@ -76,7 +73,6 @@ android { androidTest.assets.srcDirs += files("$projectDir/schemas".toString()) } - packagingOptions { // Exclude unneeded files added by libraries exclude 'LICENSE_OFL' @@ -96,77 +92,90 @@ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } } -ext.daggerVersion = '2.24' +ext.roomVersion = '2.2.1' ext.retrofitVersion = '2.6.0' +ext.okhttpVersion = '4.2.2' +ext.glideVersion = '4.10.0' +ext.daggerVersion = '2.25.2' // if libraries are changed here, they should also be changed in LicenseActivity dependencies { - implementation('com.mikepenz:materialdrawer:6.1.2@aar') { - transitive = true - } - implementation 'androidx.core:core:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.browser:browser:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'com.google.android.material:material:1.1.0-beta01' - implementation 'androidx.exifinterface:exifinterface:1.0.0' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.preference:preference:1.1.0' - implementation 'androidx.sharetarget:sharetarget:1.0.0-beta01' + + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + + implementation "androidx.core:core-ktx:1.2.0-beta01" + implementation "androidx.appcompat:appcompat:1.1.0" + implementation "androidx.browser:browser:1.0.0" + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "androidx.exifinterface:exifinterface:1.0.0" + implementation "androidx.cardview:cardview:1.0.0" + implementation "androidx.preference:preference:1.1.0" + implementation "androidx.sharetarget:sharetarget:1.0.0-beta01" + implementation "androidx.emoji:emoji:1.0.0" + implementation "androidx.emoji:emoji-appcompat:1.0.0" + implementation "androidx.lifecycle:lifecycle-extensions:2.1.0" + implementation "androidx.constraintlayout:constraintlayout:1.1.3" + implementation "androidx.paging:paging-runtime-ktx:2.1.0" implementation "androidx.viewpager2:viewpager2:1.0.0-rc01" + implementation "androidx.room:room-runtime:$roomVersion" + implementation "androidx.room:room-rxjava2:$roomVersion" + kapt "androidx.room:room-compiler:$roomVersion" + + implementation "com.google.android.material:material:1.1.0-beta01" + implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" - implementation 'com.squareup.okhttp3:okhttp:4.2.2' - implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2' - implementation 'org.conscrypt:conscrypt-android:2.2.1' - implementation 'com.github.connyduck:sparkbutton:2.0.1' - implementation 'com.github.chrisbanes:PhotoView:2.3.0' - implementation 'com.mikepenz:google-material-typeface:3.0.1.3.original@aar' - implementation('com.theartofdev.edmodo:android-image-cropper:2.8.0') { - exclude group: 'com.android.support' - } - implementation 'com.evernote:android-job:1.4.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - // EmojiCompat - implementation 'androidx.emoji:emoji:1.0.0' - implementation 'androidx.emoji:emoji-appcompat:1.0.0' - implementation 'de.c1710:filemojicompat:1.0.17' - // architecture components - implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' - //room - implementation 'androidx.room:room-runtime:2.2.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - kapt 'androidx.room:room-compiler:2.2.0' - implementation 'androidx.room:room-rxjava2:2.2.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + + implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" + implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" + + implementation "org.conscrypt:conscrypt-android:2.2.1" + + implementation "com.github.bumptech.glide:glide:$glideVersion" + implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion" + + implementation "io.reactivex.rxjava2:rxjava:2.2.13" + implementation "io.reactivex.rxjava2:rxandroid:2.1.1" + implementation "io.reactivex.rxjava2:rxkotlin:2.4.0" + + implementation "com.uber.autodispose:autodispose-android-archcomponents:1.4.0" + implementation "com.uber.autodispose:autodispose:1.4.0" + implementation "com.google.dagger:dagger:$daggerVersion" kapt "com.google.dagger:dagger-compiler:$daggerVersion" implementation "com.google.dagger:dagger-android:$daggerVersion" implementation "com.google.dagger:dagger-android-support:$daggerVersion" kapt "com.google.dagger:dagger-android-processor:$daggerVersion" - testImplementation 'org.robolectric:robolectric:4.3.1' - testImplementation 'org.mockito:mockito-inline:3.1.0' - testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', { - exclude group: 'com.android.support', module: 'support-annotations' + + implementation "com.github.connyduck:sparkbutton:2.0.1" + + implementation "com.github.chrisbanes:PhotoView:2.3.0" + + implementation("com.mikepenz:materialdrawer:6.1.2@aar") { + transitive = true + } + implementation "com.mikepenz:google-material-typeface:3.0.1.3.original@aar" + + implementation("com.theartofdev.edmodo:android-image-cropper:2.8.0") { + exclude group: "com.android.support" + } + + implementation "com.evernote:android-job:1.4.2" + + implementation "de.c1710:filemojicompat:1.0.17" + + + testImplementation "androidx.test.ext:junit:1.1.1" + testImplementation "org.robolectric:robolectric:4.3.1" + testImplementation "org.mockito:mockito-inline:3.1.0" + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + + androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1", { + exclude group: "com.android.support", module: "support-annotations" }) - androidTestImplementation 'android.arch.persistence.room:testing:1.1.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - testImplementation 'androidx.test.ext:junit:1.1.1' - debugImplementation 'im.dino:dbinspector:3.4.1@aar' - implementation 'io.reactivex.rxjava2:rxjava:2.2.13' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' - implementation 'com.uber.autodispose:autodispose-android-archcomponents:1.4.0' - implementation 'com.uber.autodispose:autodispose:1.4.0' - implementation 'androidx.paging:paging-runtime-ktx:2.1.0' + androidTestImplementation "android.arch.persistence.room:testing:1.1.1" + androidTestImplementation "androidx.test.ext:junit:1.1.1" - //Glide - implementation 'com.github.bumptech.glide:glide:4.10.0' - implementation 'com.github.bumptech.glide:okhttp3-integration:4.10.0' - - //Add some useful extensions - implementation 'androidx.core:core-ktx:1.2.0-beta01' + debugImplementation "im.dino:dbinspector:4.0.0@aar" } diff --git a/build.gradle b/build.gradle index c77e27fa..265660c6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta07' - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }