From f827200a575f2696a3c90a437b8ca4989b40e0d9 Mon Sep 17 00:00:00 2001 From: Nicolas Pomepuy <nicolas@videolabs.io> Date: Fri, 7 Jul 2023 11:03:41 +0200 Subject: [PATCH 1/2] Use a local publish.gradle This is needed as vlc-android's CI uses this project to compile the aar for Maven. Therefore, vlc-android's publish.gradle file is not accessiible from it with the new libvlcjni architecture. --- libvlc/build.gradle | 2 +- publish.gradle | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 publish.gradle diff --git a/libvlc/build.gradle b/libvlc/build.gradle index 9c35855..53c9ba7 100644 --- a/libvlc/build.gradle +++ b/libvlc/build.gradle @@ -114,4 +114,4 @@ def vlcRevision() { return vlc.toString() } -if (rootProject.hasProperty('publishScriptPath')) apply from: "$rootProject.ext.publishScriptPath" \ No newline at end of file +apply from: "../publish.gradle" \ No newline at end of file diff --git a/publish.gradle b/publish.gradle new file mode 100644 index 0000000..41518d4 --- /dev/null +++ b/publish.gradle @@ -0,0 +1,28 @@ + +group = 'org.videolan.android' +version = library_version + +def siteUrl = 'https://code.videolan.org/videolan/libvlcjni/' +def gitUrl = 'https://code.videolan.org/videolan/libvlcjni.git' + +def licenseName = 'GNU Lesser General Public License, version 2.1' +def licenseUrl = 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html' +def allLicenses = ["LGPL-2.1"] + +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs +} + +task javadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + from javadoc.destinationDir +} + +artifacts { + archives javadocJar + archives sourcesJar +} \ No newline at end of file -- GitLab From 82ab09122a9885a7d22d4c743691001f10cd5f8e Mon Sep 17 00:00:00 2001 From: Nicolas Pomepuy <nicolas@videolabs.io> Date: Fri, 7 Jul 2023 11:04:01 +0200 Subject: [PATCH 2/2] Bump libvlcjni version to 4.0.0-eap12 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 469c359..444eb45 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { } ext { - libvlcVersion = '4.0.0-eap11' + libvlcVersion = '4.0.0-eap12' minSdkVersion = 17 targetSdkVersion = 30 compileSdkVersion = 31 -- GitLab