Skip to content

Commit

Permalink
R2 11 1 (#35)
Browse files Browse the repository at this point in the history
* Added support for version 2.11.1 Exo Player

* Integrated with Mux SDK

* Separated ads build vs no ads build

* Unused imports removed

* updates to bring in line witht he rest of the code

* bump to v1.2.0

Co-authored-by: Justin Sanford <justin.h.sanford@gmail.com>
  • Loading branch information
tomkordic and jsanford8 authored Feb 25, 2020
1 parent 58e7b61 commit cc8ef24
Show file tree
Hide file tree
Showing 69 changed files with 8,674 additions and 4 deletions.
20 changes: 18 additions & 2 deletions MuxExoPlayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ android {
defaultConfig {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
versionCode 5
versionName "1.1.0"
versionCode 6
versionName "1.2.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -48,6 +48,12 @@ android {
r2_10_6_ads {
java.srcDirs = ['./src/r2_10_6/java', './src/r2_9_6_and_later/java']
}
r2_11_1 {
java.srcDirs = ['./src/r2_11_1/java', './src/r2_9_6_and_later/java']
}
r2_11_1_ads {
java.srcDirs = ['./src/r2_11_1/java', './src/r2_9_6_and_later/java']
}
}

flavorDimensions 'api'
Expand All @@ -74,6 +80,12 @@ android {
r2_10_6_ads {
dimension 'api'
}
r2_11_1 {
dimension 'api'
}
r2_11_1_ads {
dimension 'api'
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_7
Expand Down Expand Up @@ -113,6 +125,10 @@ dependencies {
r2_10_6Api 'org.checkerframework:checker-qual:2.5.0'
r2_10_6_adsApi 'com.google.android.exoplayer:exoplayer:2.10.6'
r2_10_6_adsApi 'org.checkerframework:checker-qual:2.5.0'
r2_11_1Api 'com.google.android.exoplayer:exoplayer:2.11.1'
r2_11_1Api 'org.checkerframework:checker-qual:2.5.2'
r2_11_1_adsApi 'com.google.android.exoplayer:exoplayer:2.11.1'
r2_11_1_adsApi 'org.checkerframework:checker-qual:2.5.2'
compileOnly 'com.google.ads.interactivemedia.v3:interactivemedia:3.9.0'
compileOnly 'com.google.android.gms:play-services-ads:15.0.1'
api files('libs/MuxCore.jar')
Expand Down
Loading

0 comments on commit cc8ef24

Please sign in to comment.