diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml index 1127eff87..98fae62c7 100644 --- a/.gitlab-ci-files/job-android.yml +++ b/.gitlab-ci-files/job-android.yml @@ -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 diff --git a/app/build.gradle b/app/build.gradle index e571fc982..876de539b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' diff --git a/build.gradle b/build.gradle index b06cb08b4..14d212062 100644 --- a/build.gradle +++ b/build.gradle @@ -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 } diff --git a/settings.gradle b/settings.gradle index 108f46e58..630dba8e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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'