From 6059c6cbae2ad8222d0cc3fd7dd660a0326a5459 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 15 Nov 2018 14:36:05 +0100 Subject: [PATCH] Fixed use of our maven repository for SDK with correct version number --- app/build.gradle | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a93f755e0..16464c09f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,30 +49,6 @@ repositories { } } -dependencies { - androidTestImplementation('com.android.support.test.espresso:espresso-core:+') { - exclude module: 'support-annotations' - } - androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' - androidTestImplementation 'junit:junit:4.12' - - implementation 'com.google.firebase:firebase-messaging:15.0.2' - implementation 'com.android.billingclient:billing:1.2' - - implementation 'org.apache.commons:commons-compress:1.16.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - - if (isLocalAarAvailable()) { - implementation project(":linphone-sdk-android") - } else { - releaseImplementation 'org.linphone:liblinphone-sdk:${defaultConfig.versionName}' - debugImplementation 'org.linphone:liblinphone-sdk:${defaultConfig.versionName}-DEBUG' - } -} - android { compileSdkVersion 28 defaultConfig { @@ -116,4 +92,28 @@ android { pickFirst 'META-INF/LICENSE' exclude 'META-INF/MANIFEST.MF' } +} + +dependencies { + androidTestImplementation('com.android.support.test.espresso:espresso-core:+') { + exclude module: 'support-annotations' + } + androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' + androidTestImplementation 'junit:junit:4.12' + + implementation 'com.google.firebase:firebase-messaging:15.0.2' + implementation 'com.android.billingclient:billing:1.2' + + implementation 'org.apache.commons:commons-compress:1.16.1' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + + if (isLocalAarAvailable()) { + implementation project(":linphone-sdk-android") + } else { + releaseImplementation "org.linphone:liblinphone-sdk:${android.defaultConfig.versionName}" + debugImplementation "org.linphone:liblinphone-sdk:${android.defaultConfig.versionName}-DEBUG" + } } \ No newline at end of file