From f430a72f07f0c35e4d7f981e9a0d81a87af8334e Mon Sep 17 00:00:00 2001 From: Nicolas Pomepuy Date: Fri, 27 Mar 2020 13:55:01 +0100 Subject: [PATCH] Rename api module and update readme file --- README.md | 15 ++++++++------- application/vlc-android/build.gradle | 2 +- {api => extension-api}/.gitignore | 0 {api => extension-api}/build.gradle | 0 {api => extension-api}/proguard-rules.pro | 0 .../videolan/vlc/plugin/api/ApplicationTest.java | 0 .../src/main/AndroidManifest.xml | 0 .../vlc/extensions/api/IExtensionHost.aidl | 0 .../vlc/extensions/api/IExtensionService.aidl | 0 .../vlc/extensions/api/VLCExtensionItem.aidl | 0 .../vlc/extensions/api/VLCExtensionItem.java | 0 .../vlc/extensions/api/VLCExtensionService.java | 3 ++- .../vlc/extensions/api/WarningActivity.java | 0 .../vlc/extensions/api/tools/Dialogs.java | 0 .../vlc/extensions/api/tools/Helpers.java | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../vlc/extensions/api/ExampleUnitTest.java | 0 settings.gradle | 2 +- 19 files changed, 12 insertions(+), 10 deletions(-) rename {api => extension-api}/.gitignore (100%) rename {api => extension-api}/build.gradle (100%) rename {api => extension-api}/proguard-rules.pro (100%) rename {api => extension-api}/src/androidTest/java/org/videolan/vlc/plugin/api/ApplicationTest.java (100%) rename {api => extension-api}/src/main/AndroidManifest.xml (100%) rename {api => extension-api}/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionHost.aidl (100%) rename {api => extension-api}/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionService.aidl (100%) rename {api => extension-api}/src/main/aidl/org/videolan/vlc/extensions/api/VLCExtensionItem.aidl (100%) rename {api => extension-api}/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionItem.java (100%) rename {api => extension-api}/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java (99%) rename {api => extension-api}/src/main/java/org/videolan/vlc/extensions/api/WarningActivity.java (100%) rename {api => extension-api}/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java (100%) rename {api => extension-api}/src/main/java/org/videolan/vlc/extensions/api/tools/Helpers.java (100%) rename {api => extension-api}/src/main/res/values/strings.xml (100%) rename {api => extension-api}/src/main/res/values/styles.xml (100%) rename {api => extension-api}/src/test/java/org/videolan/vlc/extensions/api/ExampleUnitTest.java (100%) diff --git a/README.md b/README.md index a5c558896..ea782e553 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This is the official **Android** port of [VLC](https://videolan.org/vlc/). VLC on Android plays all the same files as the classical version of VLC, and features a media database for Audio and Video files and stream. -- [License](#license) - [Project Structure](#project-structure) - [LibVLC](#libvlc) +- [License](#license) - [Build](#build) - [Build Application](#build-application) - [Build LibVLC](#build-libvlc) @@ -16,15 +16,10 @@ for Audio and Video files and stream. - [Issues and feature requests](#issues-and-feature-requests) - [Support](#support) -## License -VLC for Android is licensed under [GPLv2 (or later)](COPYING). Android libraries make this, de facto, a GPLv3 application. - -VLC engine *(LibVLC)* for Android is licensed under [LGPLv2](libvlc/COPYING.LIB). - ## Project Structure Here are the current folders of vlc-android project: -- api : Application extensions SDK (not released yet) +- extension-api : Application extensions SDK (not released yet) - application : Android application source code, organized by modules. - buildsystem : Build scripts, CI and maven publication configuration - libvlc : LibVLC gradle module, VLC source code will be cloned in `vlc/` at root level. @@ -51,6 +46,12 @@ And more. You can use our LibVLC module to power your own Android media player. Have a look at our [sample codes](https://code.videolan.org/videolan/libvlc-android-samples). + +## License +VLC for Android is licensed under [GPLv2 (or later)](COPYING). Android libraries make this, de facto, a GPLv3 application. + +VLC engine *(LibVLC)* for Android is licensed under [LGPLv2](libvlc/COPYING.LIB). + ## Build Native libraries are published on bintray. So you can: diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle index 133a6c671..0f2b12050 100644 --- a/application/vlc-android/build.gradle +++ b/application/vlc-android/build.gradle @@ -164,7 +164,7 @@ dependencies { releaseApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion" signedReleaseApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion" signedReleaseApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion" - api project(':api') + api project(':extension-api') api project(':application:tools') api project(':application:resources') api project(':application:mediadb') diff --git a/api/.gitignore b/extension-api/.gitignore similarity index 100% rename from api/.gitignore rename to extension-api/.gitignore diff --git a/api/build.gradle b/extension-api/build.gradle similarity index 100% rename from api/build.gradle rename to extension-api/build.gradle diff --git a/api/proguard-rules.pro b/extension-api/proguard-rules.pro similarity index 100% rename from api/proguard-rules.pro rename to extension-api/proguard-rules.pro diff --git a/api/src/androidTest/java/org/videolan/vlc/plugin/api/ApplicationTest.java b/extension-api/src/androidTest/java/org/videolan/vlc/plugin/api/ApplicationTest.java similarity index 100% rename from api/src/androidTest/java/org/videolan/vlc/plugin/api/ApplicationTest.java rename to extension-api/src/androidTest/java/org/videolan/vlc/plugin/api/ApplicationTest.java diff --git a/api/src/main/AndroidManifest.xml b/extension-api/src/main/AndroidManifest.xml similarity index 100% rename from api/src/main/AndroidManifest.xml rename to extension-api/src/main/AndroidManifest.xml diff --git a/api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionHost.aidl b/extension-api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionHost.aidl similarity index 100% rename from api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionHost.aidl rename to extension-api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionHost.aidl diff --git a/api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionService.aidl b/extension-api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionService.aidl similarity index 100% rename from api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionService.aidl rename to extension-api/src/main/aidl/org/videolan/vlc/extensions/api/IExtensionService.aidl diff --git a/api/src/main/aidl/org/videolan/vlc/extensions/api/VLCExtensionItem.aidl b/extension-api/src/main/aidl/org/videolan/vlc/extensions/api/VLCExtensionItem.aidl similarity index 100% rename from api/src/main/aidl/org/videolan/vlc/extensions/api/VLCExtensionItem.aidl rename to extension-api/src/main/aidl/org/videolan/vlc/extensions/api/VLCExtensionItem.aidl diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionItem.java b/extension-api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionItem.java similarity index 100% rename from api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionItem.java rename to extension-api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionItem.java diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java b/extension-api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java similarity index 99% rename from api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java rename to extension-api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java index 375a36f5b..152e5a963 100644 --- a/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java +++ b/extension-api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java @@ -127,7 +127,8 @@ public abstract class VLCExtensionService extends Service{ * Use it to call {@link #updateList(String, List, boolean, boolean)} with root level elements * if you want VLC to handle your extension browsing. */ - protected void onInitialize() {}; + protected void onInitialize() { + } private final IExtensionService.Stub mBinder = new IExtensionService.Stub() { @Override diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/WarningActivity.java b/extension-api/src/main/java/org/videolan/vlc/extensions/api/WarningActivity.java similarity index 100% rename from api/src/main/java/org/videolan/vlc/extensions/api/WarningActivity.java rename to extension-api/src/main/java/org/videolan/vlc/extensions/api/WarningActivity.java diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java b/extension-api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java similarity index 100% rename from api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java rename to extension-api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/tools/Helpers.java b/extension-api/src/main/java/org/videolan/vlc/extensions/api/tools/Helpers.java similarity index 100% rename from api/src/main/java/org/videolan/vlc/extensions/api/tools/Helpers.java rename to extension-api/src/main/java/org/videolan/vlc/extensions/api/tools/Helpers.java diff --git a/api/src/main/res/values/strings.xml b/extension-api/src/main/res/values/strings.xml similarity index 100% rename from api/src/main/res/values/strings.xml rename to extension-api/src/main/res/values/strings.xml diff --git a/api/src/main/res/values/styles.xml b/extension-api/src/main/res/values/styles.xml similarity index 100% rename from api/src/main/res/values/styles.xml rename to extension-api/src/main/res/values/styles.xml diff --git a/api/src/test/java/org/videolan/vlc/extensions/api/ExampleUnitTest.java b/extension-api/src/test/java/org/videolan/vlc/extensions/api/ExampleUnitTest.java similarity index 100% rename from api/src/test/java/org/videolan/vlc/extensions/api/ExampleUnitTest.java rename to extension-api/src/test/java/org/videolan/vlc/extensions/api/ExampleUnitTest.java diff --git a/settings.gradle b/settings.gradle index 9030fe4d0..4e64af4ba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':libvlc', ':api', ':medialibrary' +include ':libvlc', ':extension-api', ':medialibrary' include ':application:tools', ':application:resources', ':application:mediadb', ':application:app', ':application:live-plot-graph', ':application:television' include ':application:vlc-android' include ':application:moviepedia'