gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build issues

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-04-18 01:33:24 +02:00
parent dc3f9bd568
commit b335d34e18
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -100,7 +100,7 @@ android {
} }
ext { ext {
workVersion = "1.0.0" workVersion = "1.0.1"
} }
@ -119,6 +119,7 @@ dependencies {
implementation 'org.michaelevans.colorart:library:0.0.3' implementation 'org.michaelevans.colorart:library:0.0.3'
implementation "android.arch.work:work-runtime:${workVersion}" implementation "android.arch.work:work-runtime:${workVersion}"
implementation "android.arch.work:work-rxjava2:${workVersion}" implementation "android.arch.work:work-rxjava2:${workVersion}"
implementation 'com.google.android:flexbox:1.1.0'
androidTestImplementation "android.arch.work:work-testing:${workVersion}" androidTestImplementation "android.arch.work:work-testing:${workVersion}"
implementation 'androidx.biometric:biometric:1.0.0-alpha04' implementation 'androidx.biometric:biometric:1.0.0-alpha04'
@ -137,6 +138,7 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:3.13.1' implementation 'com.squareup.okhttp3:logging-interceptor:3.13.1'
implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.bluelinelabs:logansquare:1.3.7'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7' annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7'
implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0'

4
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
ext { ext {
kotlinVersion = '1.2.71' kotlinVersion = '1.3.30'
} }
repositories { repositories {
@ -13,7 +13,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.0-alpha01' classpath 'com.android.tools.build:gradle:3.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,7 +1,7 @@
#Tue Apr 03 16:56:17 CEST 2018 #Thu Apr 18 00:35:28 CEST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c distributionSha256Sum=f177768e7a032727e4338c8fd047f8f263e5bd283f67a7766c1ba4182c8455a6