Skip to content

Commit

Permalink
[PLAYER-4171] Implemented review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeyBicarte committed Sep 20, 2018
1 parent 6cd9af8 commit 52e6226
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
8 changes: 5 additions & 3 deletions FreewheelSampleApp/app/build.gradle
Expand Up @@ -30,20 +30,22 @@ task copyTask(type: Copy) {

tasks.copyTask.execute()

ext.supportLibraryVersion = "27.1.1"

project.configurations.all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'com.android.support'
&& !details.requested.name.contains('multidex')) {
details.useVersion "27.1.1"
details.useVersion "${supportLibraryVersion}"
}
}
}

dependencies {
implementation 'com.google.android.gms:play-services-ads:15.0.1'
implementation 'com.google.android.exoplayer:exoplayer:2.8.3'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation "com.android.support:support-v4:${supportLibraryVersion}"
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
implementation files('libs/FWAdManager.jar')
implementation files('libs/OoyalaFreewheelSDK.jar')
implementation files('libs/OoyalaSDK.aar')
Expand Down
8 changes: 5 additions & 3 deletions OoyalaSkinSampleApp/app/build.gradle
Expand Up @@ -80,11 +80,13 @@ repositories {
}
}

ext.supportLibraryVersion = "27.1.1"

project.configurations.all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'com.android.support'
&& !details.requested.name.contains('multidex')) {
details.useVersion "27.1.1"
details.useVersion "${supportLibraryVersion}"
}
}
}
Expand Down Expand Up @@ -118,8 +120,8 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer:2.8.3'
implementation 'com.google.android.gms:play-services-ads:15.0.1'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.8.5'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
implementation "com.android.support:recyclerview-v7:${supportLibraryVersion}"
implementation 'javax.inject:javax.inject:1'
implementation 'com.android.support:multidex:1.0.3'
implementation 'com.android.volley:volley:1.1.0'
Expand Down
Expand Up @@ -7,7 +7,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.ooyala.sample.R
import com.ooyala.sample.R.id.videoRecyclerView
import com.ooyala.sample.interfaces.VideoChooseInterface
import com.ooyala.sample.adapters.VideoRecyclerAdapter
import com.ooyala.sample.utils.AdList
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Expand Up @@ -62,11 +62,11 @@ project(':HeartbeatSampleApp').projectDir = new File(settingsDir, './HeartbeatSa

// Developer
//include ':skin'
//project(':skin').projectDir=new File(settingsDir, '../native-skin/sdk/android/skin/')
//project(':skin').projectDir = new File(settingsDir, '../native-skin/sdk/android/skin/')
//include ':core'
//project(':core').projectDir=new File(settingsDir, '../android-sdk/sdk/core/')
//project(':core').projectDir = new File(settingsDir, '../android-sdk/sdk/core/')
//include ':cast'
//project(':cast').projectDir=new File(settingsDir, '../android-sdk/sdk/cast/')
//project(':cast').projectDir = new File(settingsDir, '../android-sdk/sdk/cast/')
//include(':vrsdk')
//project(':vrsdk').projectDir = new File(settingsDir, '../android-sdk/sdk/vrsdk/')
//include(':ima')
Expand Down

0 comments on commit 52e6226

Please sign in to comment.