Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cling version (2.1.2-SNAPSHOT) #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
53 changes: 25 additions & 28 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
applicationId "com.zxt.dlna"
minSdkVersion 15
targetSdkVersion 21
targetSdkVersion 25
}

buildTypes {
Expand All @@ -16,32 +16,29 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

packagingOptions {
exclude 'META-INF/beans.xml'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

dependencies {
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:design:22.2.0'
compile 'com.android.support:cardview-v7:22.2.0'
compile 'com.android.support:recyclerview-v7:22.2.0'
compile files('libs/cdi-api.jar')
compile files('libs/http-2.2.1.jar')
compile files('libs/httpclient-4.2.2.jar')
compile files('libs/httpcore-4.2.3.jar')
compile files('libs/javax.annotation_1.0.jar')
compile files('libs/javax.inject.jar')
compile files('libs/javax.servlet-3.0.0.v201103241009.jar')
compile files('libs/jetty-client-8.1.9.v20130131.jar')
compile files('libs/jetty-continuation-8.1.9.v20130131.jar')
compile files('libs/jetty-http-8.1.9.v20130131.jar')
compile files('libs/jetty-io-8.1.9.v20130131.jar')
compile files('libs/jetty-security-8.1.9.v20130131.jar')
compile files('libs/jetty-server-8.1.9.v20130131.jar')
compile files('libs/jetty-servlet-8.1.9.v20130131.jar')
compile files('libs/jetty-util-8.1.9.v20130131.jar')
compile files('libs/seamless-http-1.0-alpha2.jar')
compile files('libs/seamless-util-1.0-alpha2.jar')
compile files('libs/seamless-xml-1.0-alpha2.jar')
compile files('libs/slf4j-api-1.6.1.jar')
compile files('libs/slf4j-jdk14-1.6.1.jar')
compile files('libs/universal-image-loader-1.8.4-with-sources.jar')
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.android.support:cardview-v7:25.3.0'
compile 'com.android.support:recyclerview-v7:25.3.0'
compile 'org.fourthline.cling:cling-core:2.1.2-SNAPSHOT'
compile 'org.fourthline.cling:cling-support:2.1.2-SNAPSHOT'
compile 'org.eclipse.jetty:jetty-server:8.1.18.v20150929'
compile 'org.eclipse.jetty:jetty-servlet:8.1.18.v20150929'
compile 'org.eclipse.jetty:jetty-client:8.1.18.v20150929'
compile 'org.eclipse.jetty:jetty-http:8.1.18.v20150929'
compile 'org.slf4j:slf4j-jdk14:1.7.25'
compile 'org.slf4j:slf4j-api:1.7.25'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.8.4'
}
Binary file removed app/libs/cdi-api.jar
Binary file not shown.
Binary file removed app/libs/http-2.2.1.jar
Binary file not shown.
Binary file removed app/libs/httpclient-4.2.2.jar
Binary file not shown.
Binary file removed app/libs/httpcore-4.2.3.jar
Binary file not shown.
Binary file removed app/libs/javax.annotation_1.0.jar
Binary file not shown.
Binary file removed app/libs/javax.inject.jar
Binary file not shown.
Binary file removed app/libs/javax.servlet-3.0.0.v201103241009.jar
Binary file not shown.
Binary file removed app/libs/jetty-client-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-continuation-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-http-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-io-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-security-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-server-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-servlet-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/jetty-util-8.1.9.v20130131.jar
Binary file not shown.
Binary file removed app/libs/seamless-http-1.0-alpha2.jar
Binary file not shown.
Binary file removed app/libs/seamless-util-1.0-alpha2.jar
Binary file not shown.
Binary file removed app/libs/seamless-xml-1.0-alpha2.jar
Binary file not shown.
Binary file removed app/libs/slf4j-api-1.6.1.jar
Binary file not shown.
Binary file removed app/libs/slf4j-jdk14-1.6.1.jar
Binary file not shown.
Binary file not shown.
19 changes: 4 additions & 15 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zxt.dlna"
android:versionCode="2"
android:versionName="2.0" >
android:versionCode="3"
android:versionName="2.1" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
</uses-permission>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" >
</uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="21" />

<application
android:name="com.zxt.dlna.application.BaseApplication"
Expand Down Expand Up @@ -101,7 +96,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="" />
<data android:scheme="file" />
<data android:scheme="ftp" />
<data android:scheme="content" />
Expand All @@ -121,11 +115,6 @@
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.NoTitleBar" >
</activity>
<activity
android:name="com.zxt.dlna.dmc.RemoteVideoPlay"
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.NoTitleBar" >
</activity>

<service android:name="com.zxt.dlna.dmr.RenderPlayerService" />
<service android:name="org.fourthline.cling.android.AndroidUpnpServiceImpl" />
Expand Down
Loading