Migrated maven repositories to settings.gradle file, update .gitlab-ci file to allow override

This commit is contained in:
Sylvain Berfini 2021-12-30 12:39:28 +01:00
parent c63a8cf2fd
commit a2ac7e9f37
4 changed files with 25 additions and 28 deletions

View file

@ -7,6 +7,7 @@ job-android:
before_script:
- if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi
- if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then echo "$SCP_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null; fi
- echo "$ANDROID_SETTINGS_GRADLE" > settings.gradle
script:
- sdkmanager

View file

@ -195,24 +195,6 @@ android {
}
}
repositories {
maven {
name "local linphone-sdk maven repository"
url file(LinphoneSdkBuildDir + '/maven_repository/')
content {
includeGroup "org.linphone"
}
}
maven {
name "linphone.org maven repository"
url "https://linphone.org/maven_repository"
content {
includeGroup "org.linphone"
}
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.4.0'

View file

@ -19,16 +19,6 @@ buildscript {
}
}
allprojects {
repositories {
mavenCentral()
google()
maven {
url "https://www.jitpack.io"
} // for com.github.chrisbanes:PhotoView
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

View file

@ -1,2 +1,26 @@
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
repositories {
google()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://www.jitpack.io" } // for com.github.chrisbanes:PhotoView
maven {
name "local linphone-sdk maven repository"
url file(LinphoneSdkBuildDir + '/maven_repository/')
content {
includeGroup "org.linphone"
}
}
maven {
name "linphone.org maven repository"
url "https://linphone.org/maven_repository"
content {
includeGroup "org.linphone"
}
}
}
}
include ':app'
rootProject.name='Linphone'