FEC-12338 ExoPlayer upgrade to v2.18.2 (#156)

kaltura · Dec 5, 2022 · a70e71b · a70e71b
1 parent f597b79
commit a70e71b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/imaplugin/build.gradle b/imaplugin/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply from: 'version.gradle'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionName libVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -36,7 +36,7 @@ dependencies {
     //implementation project(":playkit")
 
     // Kotlin Config
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     //Ads library.

diff --git a/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoAdPlaybackAnalyticsListener.kt b/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoAdPlaybackAnalyticsListener.kt
@@ -7,7 +7,7 @@ import com.kaltura.android.exoplayer2.decoder.DecoderReuseEvaluation
 import com.kaltura.android.exoplayer2.trackselection.DefaultTrackSelector
 import com.kaltura.android.exoplayer2.util.EventLogger
 
-class ExoAdPlaybackAnalyticsListener(trackSelector: DefaultTrackSelector): EventLogger(trackSelector) {
+class ExoAdPlaybackAnalyticsListener: EventLogger() {
 
     interface VideoFormatChangedListener {
         fun videoFormatChanged(format: Format)

diff --git a/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoPlayerWithAdPlayback.java b/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoPlayerWithAdPlayback.java
@@ -339,7 +339,7 @@ public VideoProgressUpdate getAdProgress() {
     @NonNull
     private ExoAdPlaybackAnalyticsListener getEventLogger() {
         if (eventLogger == null) {
-            eventLogger = new ExoAdPlaybackAnalyticsListener(getTrackSelector());
+            eventLogger = new ExoAdPlaybackAnalyticsListener();
             eventLogger.setListener(this);
         }
 
@@ -350,7 +350,7 @@ private ExoAdPlaybackAnalyticsListener getEventLogger() {
     private DefaultTrackSelector getTrackSelector() {
         if (trackSelector == null) {
             trackSelector = new DefaultTrackSelector(mContext, new AdaptiveTrackSelection.Factory());
-            DefaultTrackSelector.ParametersBuilder builder = new DefaultTrackSelector.ParametersBuilder(mContext);
+            DefaultTrackSelector.Parameters.Builder builder = new DefaultTrackSelector.Parameters.Builder(mContext);
             trackSelector.setParameters(builder.build());
         }
         return trackSelector;
@@ -690,13 +690,13 @@ private MediaItem buildMediaItem(Uri uri) {
                         .setClippingConfiguration(clippingConfiguration);
 
         switch (Util.inferContentType(uri)) {
-            case C.TYPE_DASH:
+            case C.CONTENT_TYPE_DASH:
                 builder.setMimeType(PKMediaFormat.dash.mimeType);
                 break;
-            case C.TYPE_HLS:
+            case C.CONTENT_TYPE_HLS:
                 builder.setMimeType(PKMediaFormat.hls.mimeType);
                 break;
-            case C.TYPE_OTHER:
+            case C.CONTENT_TYPE_OTHER:
                 builder.setMimeType(PKMediaFormat.mp4.mimeType);
                 break;
             default:

diff --git a/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/IMAPlugin.java b/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/IMAPlugin.java
@@ -1132,7 +1132,7 @@ private AdInfo createAdInfo(Ad ad) {
                 (adPodTimeOffset < 0) ? -1 : adPodTimeOffset);
         adInfo.setStreamId(streamId);
 
-        log.v("AdInfo: " + adInfo.toString());
+        log.v("AdInfo: " + adInfo);
         return adInfo;
     }
 
@@ -1728,7 +1728,7 @@ private void logCuePointsData() {
             for (Long cuePoint : adTagCuePoints.getAdCuePoints()) {
                 cuePointBuilder.append(cuePoint).append("|");
             }
-            log.d("sendCuePointsUpdate cuePoints = " + cuePointBuilder.toString());
+            log.d("sendCuePointsUpdate cuePoints = " + cuePointBuilder);
         }
     }
 

diff --git a/imaplugin/src/main/java/com/kaltura/playkit/plugins/imadai/IMADAIPlugin.java b/imaplugin/src/main/java/com/kaltura/playkit/plugins/imadai/IMADAIPlugin.java
@@ -947,7 +947,7 @@ private List<Long> buildCuePointsList() {
                 }
                 cuePointIndex++;
             }
-            log.d("buildCuePointsList pluginCuePoints = " + cuePointBuilder.toString());
+            log.d("buildCuePointsList pluginCuePoints = " + cuePointBuilder);
         }
         return cuePointsList;
     }
@@ -1000,7 +1000,7 @@ private AdInfo createAdInfo(Ad ad) {
                 isAdInfoPostRoll(adPodTimeOffset) ? -1 : adPodTimeOffset);
         adInfo.setStreamId(streamId);
 
-        log.v("AdInfo: " + adInfo.toString());
+        log.v("AdInfo: " + adInfo);
         return adInfo;
 
     }