Skip to content

SDK / exoplayer

Go to a project
Commit c0f0cbcb by Oliver Woodman
Options

Move to target API level 23

parent d8b1f9ef
Inline Side-by-side
Showing with 38 additions and 38 deletions
demo/build.gradle
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
release { release {
......
demo/src/main/AndroidManifest.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
<application <application
android:label="@string/application_name" android:label="@string/application_name"
......
demo/src/main/project.properties
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-22 target=android-23
android.library=false android.library=false
android.library.reference.1=../../../library/src/main android.library.reference.1=../../../library/src/main
demo_misc/vp9_opus_sw/build.gradle
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
release { release {
......
demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<uses-feature android:glEsVersion="0x00020000"></uses-feature> <uses-feature android:glEsVersion="0x00020000"></uses-feature>
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
<application <application
tools:ignore="UnusedAttribute" tools:ignore="UnusedAttribute"
......
demo_misc/vp9_opus_sw/src/main/project.properties
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-22 target=android-23
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main
android.library.reference.2=../../../../extensions/opus/src/main android.library.reference.2=../../../../extensions/opus/src/main
android.library.reference.3=../../../../extensions/vp9/src/main android.library.reference.3=../../../../extensions/vp9/src/main
extensions/okhttp/build.gradle
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
// limitations under the License. // limitations under the License.
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android{ android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
......
extensions/okhttp/src/main/AndroidManifest.xml
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.ext.okhttp"> package="com.google.android.exoplayer.ext.okhttp">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
</manifest> </manifest>
extensions/okhttp/src/main/project.properties
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-22 target=android-23
android.library=true android.library=true
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main
extensions/opus/build.gradle
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
......
extensions/opus/src/main/AndroidManifest.xml
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.ext.opus"> package="com.google.android.exoplayer.ext.opus">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
</manifest> </manifest>
extensions/opus/src/main/project.properties
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-22 target=android-23
android.library=true android.library=true
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main
extensions/vp9/build.gradle
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
......
extensions/vp9/src/main/AndroidManifest.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.ext.vp9"> package="com.google.android.exoplayer.ext.vp9">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
<uses-feature android:glEsVersion="0x00020000"/> <uses-feature android:glEsVersion="0x00020000"/>
</manifest> </manifest>
extensions/vp9/src/main/project.properties
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-22 target=android-23
android.library=true android.library=true
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main
library/build.gradle
...@@ -15,8 +15,8 @@ apply plugin: 'com.android.library' ...@@ -15,8 +15,8 @@ apply plugin: 'com.android.library'
apply plugin: 'bintray-release' apply plugin: 'bintray-release'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
// Important: ExoPlayerLib specifies a minSdkVersion of 9 because // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
...@@ -25,7 +25,7 @@ android { ...@@ -25,7 +25,7 @@ android {
// functionality provided by the library requires API level 16 or // functionality provided by the library requires API level 16 or
// greater. // greater.
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
......
library/src/androidTest/AndroidManifest.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer.test"> package="com.google.android.exoplayer.test">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
library/src/androidTest/project.properties
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-22 target=android-23
android.library=false android.library=false
android.library.reference.1=../main android.library.reference.1=../main
library/src/main/AndroidManifest.xml
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
the library may be of use on older devices. However, please note that the core video playback the library may be of use on older devices. However, please note that the core video playback
functionality provided by the library requires API level 16 or greater. functionality provided by the library requires API level 16 or greater.
--> -->
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
</manifest> </manifest>
library/src/main/project.properties
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-22 target=android-23
android.library=true android.library=true
playbacktests/build.gradle
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.1"
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 23
} }
buildTypes { buildTypes {
release { release {
......
playbacktests/src/main/AndroidManifest.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
playbacktests/src/main/project.properties
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-22 target=android-23
android.library=false android.library=false
android.library.reference.1=../../../library/src/main android.library.reference.1=../../../library/src/main
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment