From 1b445ef0db8cef01ae7655d2fbaa93961890fa2d Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 22 May 2017 11:18:45 +0200 Subject: [PATCH] Fix liblinphone-sdk javadoc --- libLinphoneAndroidSdk.gradle | 8 +++++++- submodules/linphone | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index 5f849e49f..7cf6e934b 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -20,10 +20,15 @@ allprojects { } } +configurations { + javadocDeps +} + apply plugin: 'com.android.library' dependencies { - compile group: 'org.apache.commons', name: 'commons-compress', version: '1.5' + compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' + javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '1.14' } def submoduleDir = ['submodules/mediastreamer2/java/src', @@ -86,6 +91,7 @@ task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") { '**/**.aidl'] classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += files(android.libraryVariants.release.javaCompile.classpath.files) + classpath += configurations.javadocDeps } task sourcesJar(type: Jar) { diff --git a/submodules/linphone b/submodules/linphone index 2b6bcbc7f..c3f94fbdd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2b6bcbc7f46423d17c18f2e2eafe52ac245e337f +Subproject commit c3f94fbddf73fdab12c403a6c3ee2cfb6d0ba334