From a221e1fdbbb1fc6eee154bd9efb53c0919554aee Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 27 Jan 2021 11:00:05 +0100 Subject: [PATCH] Updated dependency & trying to fix build issue in gitlab CI --- app/build.gradle | 10 +++++++--- build.gradle | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d8c99d0f8..e13f88330 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,10 +47,14 @@ task getGitVersion() { project.version = gitVersion } +configurations { + customImplementation + implementation.extendsFrom(customImplementation) +} + task linphoneSdkSource() { doLast { - configurations.implementation.canBeResolved = true - configurations.implementation.getIncoming().each { + configurations.customImplementation.getIncoming().each { it.getResolutionResult().allComponents.each { if (it.id.getDisplayName().contains("linphone-sdk-android")) { println 'Linphone SDK used is ' + it.moduleVersion.version + ' from ' + it.properties["repositoryName"] @@ -65,7 +69,7 @@ project.tasks['preBuild'].dependsOn 'linphoneSdkSource' android { compileSdkVersion 30 - buildToolsVersion '30.0.2' + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 23 targetSdkVersion 30 diff --git a/build.gradle b/build.gradle index 93040a295..147944194 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.google.gms:google-services:4.3.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"