From 02e8b5e969cc00569ffc4696ffa833cb6b244354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 2 Feb 2022 12:07:57 -0500
Subject: [PATCH] build: upgrade tools
Change-Id: I375867b65b2f3b53caef28b6b8dca5159423a90e
---
ring-android/app/build.gradle.kts | 15 +++++++--------
ring-android/build.gradle.kts | 2 +-
.../gradle/wrapper/gradle-wrapper.properties | 4 ++--
ring-android/libjamiclient/build.gradle.kts | 1 -
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ring-android/app/build.gradle.kts b/ring-android/app/build.gradle.kts
index 9f060cd50..82488f8f1 100644
--- a/ring-android/app/build.gradle.kts
+++ b/ring-android/app/build.gradle.kts
@@ -65,9 +65,6 @@ android {
storeFile = file("../keystore.bin")
}
}
- lint {
- disable("MissingTranslation")
- }
splits {
abi {
isEnable = true
@@ -90,8 +87,8 @@ dependencies {
implementation (project(":libjamiclient"))
implementation ("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation ("androidx.core:core-ktx:1.7.0")
- implementation ("androidx.appcompat:appcompat:1.4.0")
- implementation ("androidx.constraintlayout:constraintlayout:2.1.2")
+ implementation ("androidx.appcompat:appcompat:1.4.1")
+ implementation ("androidx.constraintlayout:constraintlayout:2.1.3")
implementation ("androidx.legacy:legacy-support-core-utils:1.0.0")
implementation ("androidx.cardview:cardview:1.0.0")
implementation ("androidx.preference:preference-ktx:1.1.1")
@@ -101,7 +98,7 @@ dependencies {
implementation ("androidx.tvprovider:tvprovider:1.1.0-alpha01")
implementation ("androidx.media:media:1.4.3")
implementation ("androidx.percentlayout:percentlayout:1.0.0")
- implementation ("com.google.android.material:material:1.5.0-rc01")
+ implementation ("com.google.android.material:material:1.5.0")
implementation ("com.google.android.flexbox:flexbox:3.0.0")
implementation ("org.osmdroid:osmdroid-android:6.1.11")
implementation ("androidx.sharetarget:sharetarget:1.2.0-rc01")
@@ -115,11 +112,13 @@ dependencies {
// Dagger dependency injection
implementation("com.google.dagger:hilt-android:$hilt_version")
- implementation("androidx.test.ext:junit-ktx:1.1.3")
+ kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
+
+ // Espresso Unit Tests
+ androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
- kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
// Glide
implementation ("com.github.bumptech.glide:glide:4.12.0")
diff --git a/ring-android/build.gradle.kts b/ring-android/build.gradle.kts
index 35760f9ab..1b0b775e8 100644
--- a/ring-android/build.gradle.kts
+++ b/ring-android/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
val hilt_version by extra { "2.40.5" }
dependencies {
- classpath ("com.android.tools.build:gradle:7.0.4")
+ classpath ("com.android.tools.build:gradle:7.1.0")
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")
diff --git a/ring-android/gradle/wrapper/gradle-wrapper.properties b/ring-android/gradle/wrapper/gradle-wrapper.properties
index 6ef9323b7..9c755ea83 100644
--- a/ring-android/gradle/wrapper/gradle-wrapper.properties
+++ b/ring-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 04 15:30:10 EST 2021
+#Tue Feb 01 18:53:00 EST 2022
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/ring-android/libjamiclient/build.gradle.kts b/ring-android/libjamiclient/build.gradle.kts
index 2bfb981c2..d7924595d 100644
--- a/ring-android/libjamiclient/build.gradle.kts
+++ b/ring-android/libjamiclient/build.gradle.kts
@@ -2,7 +2,6 @@ val kotlin_version: String by rootProject.extra
val hilt_version: String by rootProject.extra
val dokka_version: String by rootProject.extra
-
plugins {
id("kotlin")
id("java")
--
GitLab