Skip to content
Snippets Groups Projects
Commit 30497e7c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

gradle: update configuration

Change-Id: I4fe2144b101f881b455a09c7ba5ebcc223823d90
parent 8ba3fdaa
No related branches found
No related tags found
No related merge requests found
......@@ -66,8 +66,8 @@ RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.2.tar.
# Android SDK libraries, NDK
RUN sdkmanager --sdk_root=${ANDROID_HOME} --update
RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${ANDROID_HOME} 'build-tools;31.0.0' \
'platforms;android-31'\
RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${ANDROID_HOME} 'build-tools;32.0.0' \
'platforms;android-32'\
'extras;android;m2repository'\
'extras;google;m2repository'\
'ndk;23.1.7779620'
......
......@@ -12,12 +12,12 @@ plugins {
}
android {
compileSdk = 31
buildToolsVersion = "31.0.0"
compileSdk = 32
buildToolsVersion = "32.0.0"
ndkVersion = "23.0.7599858"
defaultConfig {
minSdk = 21
targetSdk = 31
targetSdk = 32
versionCode = 332
versionName = "20220602-01"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
......@@ -118,8 +118,8 @@ dependencies {
androidTestImplementation("androidx.test.ext:junit:1.1.3")
// Glide
implementation ("com.github.bumptech.glide:glide:4.13.1")
kapt ("com.github.bumptech.glide:compiler:4.13.1")
implementation ("com.github.bumptech.glide:glide:4.13.2")
kapt ("com.github.bumptech.glide:compiler:4.13.2")
// RxAndroid
implementation ("io.reactivex.rxjava3:rxandroid:3.0.0")
......@@ -128,7 +128,7 @@ dependencies {
implementation ("com.jsibbold:zoomage:1.3.1")
implementation ("com.googlecode.ez-vcard:ez-vcard:0.11.3")
"withFirebaseImplementation"("com.google.firebase:firebase-messaging:23.0.3") {
"withFirebaseImplementation"("com.google.firebase:firebase-messaging:23.0.5") {
exclude(group= "com.google.firebase", module= "firebase-core")
exclude(group= "com.google.firebase", module= "firebase-analytics")
exclude(group= "com.google.firebase", module= "firebase-measurement-connector")
......
......@@ -6,10 +6,10 @@ buildscript {
}
val kotlin_version by extra { "1.6.21" }
val hilt_version by extra { "2.41" }
val hilt_version by extra { "2.42" }
dependencies {
classpath ("com.android.tools.build:gradle:7.1.3")
classpath ("com.android.tools.build:gradle:7.2.1")
classpath ("com.google.gms:google-services:4.3.10")
classpath ("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
classpath ("com.google.dagger:hilt-android-gradle-plugin:$hilt_version")
......
......@@ -2,4 +2,5 @@ archs=
org.gradle.jvmargs=-Xmx3048M
android.builder.sdkDownload=false
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
org.gradle.unsafe.configuration-cache=true
#Tue Feb 01 18:53:00 EST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment