Updated dependency & trying to fix build issue in gitlab CI

This commit is contained in:
Sylvain Berfini 2021-01-27 11:00:05 +01:00
parent f028e26e82
commit a221e1fdbb
2 changed files with 8 additions and 4 deletions

View file

@ -47,10 +47,14 @@ task getGitVersion() {
project.version = gitVersion project.version = gitVersion
} }
configurations {
customImplementation
implementation.extendsFrom(customImplementation)
}
task linphoneSdkSource() { task linphoneSdkSource() {
doLast { doLast {
configurations.implementation.canBeResolved = true configurations.customImplementation.getIncoming().each {
configurations.implementation.getIncoming().each {
it.getResolutionResult().allComponents.each { it.getResolutionResult().allComponents.each {
if (it.id.getDisplayName().contains("linphone-sdk-android")) { if (it.id.getDisplayName().contains("linphone-sdk-android")) {
println 'Linphone SDK used is ' + it.moduleVersion.version + ' from ' + it.properties["repositoryName"] println 'Linphone SDK used is ' + it.moduleVersion.version + ' from ' + it.properties["repositoryName"]
@ -65,7 +69,7 @@ project.tasks['preBuild'].dependsOn 'linphoneSdkSource'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion '30.0.2' buildToolsVersion '30.0.3'
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30

View file

@ -12,7 +12,7 @@ buildscript {
} }
dependencies { 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 'com.google.gms:google-services:4.3.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1" classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"