diff --git a/.gitignore b/.gitignore index 79a68503c..c7b1543ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .idea .gradle *.jks -*.aar +lib-*.aar *build /media* /Release diff --git a/app/build.gradle b/app/build.gradle index 1fea3a390..ef7bf465a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,17 +119,17 @@ dependencies { implementation 'io.antmedia:rtmp-client:3.2.0' 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.21.v20160908' - implementation 'org.eclipse.jetty:jetty-server:8.1.21.v20160908' - implementation 'org.eclipse.jetty:jetty-servlet:8.1.21.v20160908' - implementation 'org.fourthline.cling:cling-core:2.1.1' - implementation 'org.fourthline.cling:cling-support:2.1.1' + 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.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' implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } - implementation(ext: 'aar', name: 'dlna-core', group: 'fongmi', version: 'release') - implementation(ext: 'aar', name: 'dlna-dmc', group: 'fongmi', version: 'release') - implementation(ext: 'aar', name: 'dlna-dmr', group: 'fongmi', version: 'release') + 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: '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/dlna-core-release.aar b/app/libs/dlna-core-release.aar new file mode 100644 index 000000000..43643fa9d Binary files /dev/null and b/app/libs/dlna-core-release.aar differ diff --git a/app/libs/dlna-core.aar b/app/libs/dlna-core.aar deleted file mode 100644 index af4c9fcc3..000000000 Binary files a/app/libs/dlna-core.aar and /dev/null differ diff --git a/app/libs/dlna-dmc-release.aar b/app/libs/dlna-dmc-release.aar new file mode 100644 index 000000000..c529ce2b9 Binary files /dev/null and b/app/libs/dlna-dmc-release.aar differ diff --git a/app/libs/dlna-dmc.aar b/app/libs/dlna-dmc.aar deleted file mode 100644 index 97634d04c..000000000 Binary files a/app/libs/dlna-dmc.aar and /dev/null differ diff --git a/app/libs/dlna-dmr-release.aar b/app/libs/dlna-dmr-release.aar new file mode 100644 index 000000000..46b59d884 Binary files /dev/null and b/app/libs/dlna-dmr-release.aar differ diff --git a/app/libs/dlna-dmr.aar b/app/libs/dlna-dmr.aar deleted file mode 100644 index 7bb79a622..000000000 Binary files a/app/libs/dlna-dmr.aar and /dev/null differ