chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

update deps, cleanup build file (#1546)

Browse source
This commit is contained in:
Konrad Pozniak 2019-11-06 20:48:58 +01:00 committed by GitHub
parent d2ca776b34
commit d3ebcc14ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
app/build.gradle
View file

@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
apply from: "../instance-build.gradle" apply from: "../instance-build.gradle"
def getGitSha = { -> def getGitSha = {
def stdout = new ByteArrayOutputStream() def stdout = new ByteArrayOutputStream()
exec { exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD' commandLine 'git', 'rev-parse', '--short', 'HEAD'
@ -63,9 +63,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
androidExtensions {
experimental = true
}
testOptions { testOptions {
unitTests { unitTests {
returnDefaultValues = true returnDefaultValues = true
@ -76,7 +73,6 @@ android {
androidTest.assets.srcDirs += files("$projectDir/schemas".toString()) androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
} }
packagingOptions { packagingOptions {
// Exclude unneeded files added by libraries // Exclude unneeded files added by libraries
exclude 'LICENSE_OFL' 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.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 // if libraries are changed here, they should also be changed in LicenseActivity
dependencies { dependencies {
implementation('com.mikepenz:materialdrawer:6.1.2@aar') {
transitive = true implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
implementation 'androidx.core:core:1.1.0' implementation "androidx.core:core-ktx:1.2.0-beta01"
implementation 'androidx.appcompat:appcompat:1.1.0' implementation "androidx.appcompat:appcompat:1.1.0"
implementation 'androidx.browser:browser:1.0.0' implementation "androidx.browser:browser:1.0.0"
implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation "androidx.exifinterface:exifinterface:1.0.0"
implementation 'com.google.android.material:material:1.1.0-beta01' implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.exifinterface:exifinterface:1.0.0' implementation "androidx.preference:preference:1.1.0"
implementation 'androidx.cardview:cardview:1.0.0' implementation "androidx.sharetarget:sharetarget:1.0.0-beta01"
implementation 'androidx.preference:preference:1.1.0' implementation "androidx.emoji:emoji:1.0.0"
implementation 'androidx.sharetarget:sharetarget:1.0.0-beta01' 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.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:retrofit:$retrofitVersion"
implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
implementation "com.squareup.retrofit2:adapter-rxjava2:$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 "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation 'org.conscrypt:conscrypt-android:2.2.1' implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
implementation 'com.github.connyduck:sparkbutton:2.0.1'
implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation "org.conscrypt:conscrypt-android:2.2.1"
implementation 'com.mikepenz:google-material-typeface:3.0.1.3.original@aar'
implementation('com.theartofdev.edmodo:android-image-cropper:2.8.0') { implementation "com.github.bumptech.glide:glide:$glideVersion"
exclude group: 'com.android.support' implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
}
implementation 'com.evernote:android-job:1.4.2' implementation "io.reactivex.rxjava2:rxjava:2.2.13"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
// EmojiCompat implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
implementation 'androidx.emoji:emoji:1.0.0'
implementation 'androidx.emoji:emoji-appcompat:1.0.0' implementation "com.uber.autodispose:autodispose-android-archcomponents:1.4.0"
implementation 'de.c1710:filemojicompat:1.0.17' implementation "com.uber.autodispose:autodispose:1.4.0"
// 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.google.dagger:dagger:$daggerVersion" implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion" kapt "com.google.dagger:dagger-compiler:$daggerVersion"
implementation "com.google.dagger:dagger-android:$daggerVersion" implementation "com.google.dagger:dagger-android:$daggerVersion"
implementation "com.google.dagger:dagger-android-support:$daggerVersion" implementation "com.google.dagger:dagger-android-support:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion" kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
testImplementation 'org.robolectric:robolectric:4.3.1'
testImplementation 'org.mockito:mockito-inline:3.1.0' implementation "com.github.connyduck:sparkbutton:2.0.1"
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', { implementation "com.github.chrisbanes:PhotoView:2.3.0"
exclude group: 'com.android.support', module: 'support-annotations'
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 "android.arch.persistence.room:testing:1.1.1"
androidTestImplementation 'androidx.test.ext:junit: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'
//Glide debugImplementation "im.dino:dbinspector:4.0.0@aar"
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'
} }

2
build.gradle
View file

@ -8,7 +8,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta07' 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }