From 0bcfc123ddee52054ee9f32f78b563a0ba3040ae Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Tue, 13 Jul 2021 18:56:22 +0200 Subject: [PATCH] Update dependencies --- build.gradle | 5 ++--- buildsystem/dependencies.gradle | 13 +++++++------ msa-auth-for-android | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 181627e0..8d5d9ced 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,13 @@ apply from: 'buildsystem/dependencies.gradle' apply plugin: "com.vanniktech.android.junit.jacoco" buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.5.21' repositories { - jcenter() mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 405da723..c26106db 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -1,6 +1,7 @@ allprojects { repositories { - jcenter() + mavenCentral() + maven { url 'https://jitpack.io' } } } @@ -35,7 +36,7 @@ ext { okHttpVersion = '4.9.1' okHttpDigestVersion = '2.5' - velocityVersion = '1.7' + velocityVersion = '2.3' timberVersion = '4.7.1' @@ -43,7 +44,7 @@ ext { scaleImageViewVersion = '3.10.0' - lruFileCacheVersion = '1.0' + lruFileCacheVersion = '1.2' // KEEP IN SYNC WITH GENERATOR VERSION IN root build.gradle greenDaoVersion = '3.3.0' @@ -135,7 +136,7 @@ ext { msgraph : "com.microsoft.graph:microsoft-graph:${msgraphVersion}", multidex : "androidx.multidex:multidex:${multidexVersion}", okHttp : "com.squareup.okhttp3:okhttp:${okHttpVersion}", - okHttpDigest : "com.burgstaller:okhttp-digest:${okHttpDigestVersion}", + okHttpDigest : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}", recyclerViewFastScroll: "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}", rxJava : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}", rxAndroid : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}", @@ -143,14 +144,14 @@ ext { stax : "stax:stax:${staxVersion}", testingSupportLib : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}", timber : "com.jakewharton.timber:timber:${timberVersion}", - velocity : "org.apache.velocity:velocity:${velocityVersion}", + velocity : "org.apache.velocity:velocity-engine-core:${velocityVersion}", runner : "androidx.test:runner:${runnerVersion}", rules : "androidx.test:rules:${rulesVersion}", contribution : "androidx.test.espresso:espresso-contrib:${contributionVersion}", uiAutomator : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}", zxcvbn : "com.nulab-inc:zxcvbn:${zxcvbnVersion}", scaleImageView : "com.davemorrissey.labs:subsampling-scale-image-view:${scaleImageViewVersion}", - lruFileCache : "com.tomclaw.cache:cache:${lruFileCacheVersion}", + lruFileCache : "com.github.solkin:disk-lru-cache:${lruFileCacheVersion}", jsonWebTokenApi : "io.jsonwebtoken:jjwt-api:${jsonWebTokenApiVersion}", jsonWebTokenImpl : "io.jsonwebtoken:jjwt-impl:${jsonWebTokenApiVersion}", jsonWebTokenJson : "io.jsonwebtoken:jjwt-orgjson:${jsonWebTokenApiVersion}" diff --git a/msa-auth-for-android b/msa-auth-for-android index fe4e0458..7c0dc9ba 160000 --- a/msa-auth-for-android +++ b/msa-auth-for-android @@ -1 +1 @@ -Subproject commit fe4e04589043cb18011cae80aec7eab09b46ed44 +Subproject commit 7c0dc9baf7ef0e6f5a701fa8817b2e34be67f21b