diff --git a/app/build.gradle b/app/build.gradle index 4aaaca261..d2e25736e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,15 +91,8 @@ android { } dependencies { - implementation project(':hook') - implementation project(':tvbus') implementation project(':catvod') implementation project(':quickjs') - implementation project(':thunder') - implementation project(':youtube') - implementation project(':jianpian') - implementation project(':forcetech') - implementation project(':nanohttpd') pythonImplementation project(':chaquo') implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.media:media:1.7.0' @@ -121,8 +114,8 @@ dependencies { implementation 'javax.servlet:javax.servlet-api:3.1.0' implementation 'org.chromium.net:cronet-embedded:76.3809.111' implementation 'org.eclipse.jetty:jetty-client:8.1.22.v20160922' - implementation 'org.eclipse.jetty:jetty-server:8.1.22.v20160922' - implementation 'org.eclipse.jetty:jetty-servlet:8.1.22.v20160922' + implementation('org.eclipse.jetty:jetty-server:8.1.22.v20160922') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } + implementation('org.eclipse.jetty:jetty-servlet:8.1.22.v20160922') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } implementation 'org.fourthline.cling:cling-core:2.1.2-SNAPSHOT' implementation 'org.fourthline.cling:cling-support:2.1.2-SNAPSHOT' implementation 'org.greenrobot:eventbus:3.3.1' @@ -130,6 +123,13 @@ dependencies { implementation(ext: 'aar', name: 'dlna-core-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'dlna-dmc-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'dlna-dmr-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'forcetech-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'hook-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'jianpian-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'nanohttpd-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'thunder-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'tvbus-release', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'youtube-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-common-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-container-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-database-release', group: 'fongmi', version: 'release') diff --git a/app/libs/forcetech-release.aar b/app/libs/forcetech-release.aar new file mode 100644 index 000000000..1d329df6c Binary files /dev/null and b/app/libs/forcetech-release.aar differ diff --git a/app/libs/hook-release.aar b/app/libs/hook-release.aar new file mode 100644 index 000000000..f74b7fc70 Binary files /dev/null and b/app/libs/hook-release.aar differ diff --git a/app/libs/jianpian-release.aar b/app/libs/jianpian-release.aar new file mode 100644 index 000000000..fa77494b5 Binary files /dev/null and b/app/libs/jianpian-release.aar differ diff --git a/app/libs/nanohttpd-release.aar b/app/libs/nanohttpd-release.aar new file mode 100644 index 000000000..d018014a7 Binary files /dev/null and b/app/libs/nanohttpd-release.aar differ diff --git a/app/libs/quickjs.aar b/app/libs/quickjs-release.aar similarity index 100% rename from app/libs/quickjs.aar rename to app/libs/quickjs-release.aar diff --git a/app/libs/thunder-release.aar b/app/libs/thunder-release.aar new file mode 100644 index 000000000..c31636d2e Binary files /dev/null and b/app/libs/thunder-release.aar differ diff --git a/app/libs/tvbus-release.aar b/app/libs/tvbus-release.aar new file mode 100644 index 000000000..8f941e4ca Binary files /dev/null and b/app/libs/tvbus-release.aar differ diff --git a/app/libs/youtube-release.aar b/app/libs/youtube-release.aar new file mode 100644 index 000000000..5496f5655 Binary files /dev/null and b/app/libs/youtube-release.aar differ diff --git a/quickjs/build.gradle b/quickjs/build.gradle index a101f9012..0a139e1c9 100644 --- a/quickjs/build.gradle +++ b/quickjs/build.gradle @@ -22,5 +22,5 @@ dependencies { implementation 'org.jsoup:jsoup:' + jsoupVersion implementation 'wang.harlon.quickjs:wrapper-java:1.0.0' implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4' - implementation(ext: 'aar', name: 'quickjs', group: 'fongmi', version: 'release') + implementation(ext: 'aar', name: 'quickjs-release', group: 'fongmi', version: 'release') } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 37b281c4b..e9187e09e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,14 +21,7 @@ dependencyResolutionManagement { } } include ':app' -include ':hook' -include ':tvbus' include ':catvod' include ':chaquo' include ':quickjs' -include ':thunder' -include ':youtube' -include ':jianpian' -include ':forcetech' -include ':nanohttpd' rootProject.name = "TV"