KUX-1761: Upgrade exoplayer to Media 3 (#176)

* KUX-1761: Upgrade exoplayer to Media 3 * ASTRO-1204: Astro -support Android 14 in player playkit SDK * ASTRO-1204: Astro -support Android 14 in player playkit SDK * ASTRO-1204: Astro -support Android 14 in player playkit SDK * ASTRO-1204: Astro -support Android 14 in player playkit SDK * Dummy change to trigger rebuild * Custom branch release publish updated
kaltura · Dec 23, 2024 · 3af043b · 3af043b
1 parent d3c26e7
commit 3af043b
Show file tree

Hide file tree

Showing 37 changed files with 177 additions and 119 deletions.
diff --git a/.github/publish.sh b/.github/publish.sh
@@ -46,10 +46,10 @@ set_version() {
 
     if [ "$RELEASE_TYPE" == "Full" ]; then
        echo "RELEASE_TYPE = '$RELEASE_TYPE'"
-       perl -pi -e "s/:playkit-android:dev-SNAPSHOT/.playkit:playkit:$NEW_VERSION/" $BUILD_GRADLE
-       perl -pi -e "s/:playkit-android-providers:develop-SNAPSHOT/.playkit:playkitproviders:$NEW_VERSION/" $BUILD_GRADLE
-       perl -pi -e "s/:playkit-android-kava:develop-SNAPSHOT/.playkit:kavaplugin:$NEW_VERSION/" $BUILD_GRADLE
-       perl -pi -e "s/:playkit-dtg-android:current-SNAPSHOT/.dtg:dtglib:$DTG_VERSION/" $BUILD_GRADLE
+       perl -pi -e "s/:playkit-android:.*?-SNAPSHOT/.playkit:playkit:$NEW_VERSION/" $BUILD_GRADLE
+       perl -pi -e "s/:playkit-android-providers:.*?-SNAPSHOT/.playkit:playkitproviders:$NEW_VERSION/" $BUILD_GRADLE
+       perl -pi -e "s/:playkit-android-kava:.*?-SNAPSHOT/.playkit:kavaplugin:$NEW_VERSION/" $BUILD_GRADLE
+       perl -pi -e "s/:playkit-dtg-android:.*?-SNAPSHOT/.dtg:dtglib:$DTG_VERSION/" $BUILD_GRADLE
     fi
 }
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,10 +20,10 @@ jobs:
       - name: Checkout repo and clone to CI workspace
         uses: actions/checkout@v3
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: 'gradle'
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -60,6 +60,13 @@ jobs:
           mkdir $PWD/.kltrenv && echo "${{ secrets.SIGNING_KEY }}" > $PWD/.kltrenv/secring.gpg.b64
           base64 -d $PWD/.kltrenv/secring.gpg.b64 > $PWD/.kltrenv/secring.gpg
 
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: 'gradle'
+
       - name: Run publish Script
         run: |
           RELEASE_TYPE=${RELEASE_TYPE} NEW_VERSION=${NEW_VERSION}

diff --git a/build.gradle b/build.gradle
@@ -8,15 +8,15 @@ ext["signingPassword"] = System.getenv('SIGNING_PASSWORD')
 
 buildscript {
 
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 01 12:55:57 IDT 2020
+#Thu Jul 11 16:22:33 IDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,4 +1,4 @@
 jdk:
-   - openjdk11
+   - openjdk17
 before_install:
    - curl https://kaltura.github.io/fe-tools/android/license.sh | sh
diff --git a/tvplayer/build.gradle b/tvplayer/build.gradle
@@ -4,14 +4,15 @@ apply from: 'version.gradle'
 
 
 android {
-    compileSdkVersion 33
+    namespace 'com.kaltura.tvplayer'
+    compileSdk 34
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -26,24 +27,33 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+    publishing {
+        publishing {
+            singleVariant('release') {
+            }
+        }
+    }
 }
 
 dependencies {
 
-    api 'com.kaltura:playkit-android:dev-SNAPSHOT'
-    api 'com.kaltura:playkit-android-providers:develop-SNAPSHOT'
-    api 'com.kaltura:playkit-android-kava:develop-SNAPSHOT'
+    api 'com.kaltura:playkit-android:KUX-1761-SNAPSHOT'
+    api 'com.kaltura:playkit-android-providers:KUX-1761-SNAPSHOT'
+    api 'com.kaltura:playkit-android-kava:KUX-1761-SNAPSHOT'
     api 'com.kaltura:playkit-dtg-android:current-SNAPSHOT'
 
 //    api project(":playkit")
 //    api project(":providers")
 //    api project(":kava")
-//    api project(":dtglib")
+//    api project(":dtglib") 
 
     implementation "androidx.work:work-runtime:2.7.1"
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation "androidx.core:core-ktx:1.9.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.4.0'
 
     androidTestImplementation 'androidx.constraintlayout:constraintlayout:2.1.2'

diff --git a/tvplayer/gradle-mvn-local.gradle b/tvplayer/gradle-mvn-local.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'maven-publish'
 
 task androidSourcesJar(type: Jar) {
-    classifier 'sources'
+    archiveClassifier = 'sources'
     from android.sourceSets.main.java.sourceFiles
 }
 
 project.afterEvaluate {
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
         repositories {

diff --git a/tvplayer/gradle-mvn-push.gradle b/tvplayer/gradle-mvn-push.gradle
@@ -27,7 +27,7 @@ afterEvaluate { project ->
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                from components.release
+                from components.findByName('release')
                 groupId = GROUP
                 artifactId = POM_ARTIFACT_ID
 
@@ -98,12 +98,12 @@ afterEvaluate { project ->
     }
 
     task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-        classifier 'javadoc'
+        archiveClassifier = 'javadoc'
         from androidJavadocs.destinationDir
     }
 
     task androidSourcesJar(type: Jar) {
-        classifier 'sources'
+        archiveClassifier = 'sources'
         from android.sourceSets.main.java.sourceFiles
     }
 

diff --git a/tvplayer/src/androidTest/AndroidManifest.xml b/tvplayer/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.kaltura.tvplayer"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 

diff --git a/tvplayer/src/androidTest/res/values/styles.xml b/tvplayer/src/androidTest/res/values/styles.xml
@@ -1,7 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light" />
-
     <style name="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

diff --git a/tvplayer/src/main/AndroidManifest.xml b/tvplayer/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kaltura.tvplayer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -19,7 +18,7 @@
             </intent-filter>
         </service>
 
-        <service android:name="com.kaltura.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
+        <service android:name="com.kaltura.androidx.media3.exoplayer.scheduler.PlatformScheduler$PlatformSchedulerService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="true"/>
     </application>

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaBasicPlayer.java b/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaBasicPlayer.java
@@ -4,8 +4,10 @@
 
 import androidx.annotation.NonNull;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKLog;
 
+@UnstableApi
 public class KalturaBasicPlayer extends KalturaPlayer {
 
     private static final PKLog log = PKLog.get("KalturaBasicPlayer");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaOttPlayer.java b/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaOttPlayer.java
@@ -2,8 +2,11 @@
 
 import android.content.Context;
 import androidx.annotation.NonNull;
+
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKLog;
 
+@UnstableApi
 public class KalturaOttPlayer extends KalturaPlayer {
 
     private static final PKLog log = PKLog.get("KalturaOttPlayer");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaOvpPlayer.java b/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaOvpPlayer.java
@@ -5,8 +5,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKLog;
 
+@UnstableApi
 public class KalturaOvpPlayer extends KalturaPlayer {
 
     private static final PKLog log = PKLog.get("KalturaOvpPlayer");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaPlayer.java b/tvplayer/src/main/java/com/kaltura/tvplayer/KalturaPlayer.java
@@ -13,6 +13,7 @@
 import androidx.annotation.Nullable;
 
 import com.google.gson.Gson;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.netkit.connect.executor.APIOkRequestsExecutor;
 import com.kaltura.netkit.connect.response.ResultElement;
 import com.kaltura.netkit.utils.ErrorElement;
@@ -73,6 +74,7 @@
 import java.util.List;
 import java.util.Map;
 
+@UnstableApi
 public abstract class KalturaPlayer {
 
     private static final PKLog log = PKLog.get("KalturaPlayer");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/OfflineManager.java b/tvplayer/src/main/java/com/kaltura/tvplayer/OfflineManager.java
@@ -5,8 +5,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.kaltura.android.exoplayer2.database.DatabaseProvider;
-import com.kaltura.android.exoplayer2.upstream.cache.Cache;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
+import com.kaltura.androidx.media3.database.DatabaseProvider;
+import com.kaltura.androidx.media3.datasource.cache.Cache;
 import com.kaltura.playkit.PKDrmParams;
 import com.kaltura.playkit.PKMediaEntry;
 import com.kaltura.playkit.PKMediaFormat;
@@ -28,6 +29,7 @@
 
 
 @SuppressWarnings({"WeakerAccess", "unused", "JavaDoc"})
+@UnstableApi
 public abstract class OfflineManager {
 
     protected String kalturaServerUrl = KalturaPlayer.DEFAULT_OVP_SERVER_URL;

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/PKPlaylistController.java b/tvplayer/src/main/java/com/kaltura/tvplayer/PKPlaylistController.java
@@ -4,6 +4,7 @@
 
 import androidx.annotation.Nullable;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.netkit.utils.ErrorElement;
 import com.kaltura.playkit.PKError;
 import com.kaltura.playkit.PKLog;
@@ -32,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 
+@UnstableApi
 public class PKPlaylistController implements PlaylistController {
 
     private static final PKLog log = PKLog.get("PlaylistController");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/PlaybackControlsView.java b/tvplayer/src/main/java/com/kaltura/tvplayer/PlaybackControlsView.java
@@ -10,10 +10,11 @@
 
 import androidx.annotation.NonNull;
 
-import com.kaltura.android.exoplayer2.Player;
-import com.kaltura.android.exoplayer2.Timeline;
-import com.kaltura.android.exoplayer2.ui.DefaultTimeBar;
-import com.kaltura.android.exoplayer2.ui.TimeBar;
+import com.kaltura.androidx.media3.common.Player;
+import com.kaltura.androidx.media3.common.Timeline;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
+import com.kaltura.androidx.media3.ui.DefaultTimeBar;
+import com.kaltura.androidx.media3.ui.TimeBar;
 import com.kaltura.playkit.PKLog;
 import com.kaltura.playkit.PlayerEvent;
 import com.kaltura.playkit.PlayerState;
@@ -27,7 +28,7 @@
 import static com.kaltura.playkit.PKMediaEntry.MediaEntryType.DvrLive;
 import static com.kaltura.playkit.PKMediaEntry.MediaEntryType.Live;
 
-
+@UnstableApi
 public class PlaybackControlsView extends LinearLayout {
 
     private static final PKLog log = PKLog.get("PlaybackControlsView");
@@ -79,7 +80,7 @@ private void initPlaybackControls() {
             togglePlayPauseClick();
         });
 
-        seekBar = this.findViewById(R.id.kexo_progress);
+        seekBar = this.findViewById(com.kaltura.androidx.media3.R.id.kexo_progress);
         seekBar.addListener(componentListener);
 
         tvCurTime = this.findViewById(R.id.time_current);

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerConfigManager.java b/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerConfigManager.java
@@ -11,6 +11,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.netkit.utils.ErrorElement;
 import com.kaltura.playkit.PKLog;
 import com.kaltura.playkit.providers.api.ovp.OvpConfigs;
@@ -26,6 +27,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
+@UnstableApi
 public class PlayerConfigManager {
 
     private static final PKLog log = PKLog.get("PlayerConfigManager");

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerInitOptions.java b/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerInitOptions.java
@@ -1,5 +1,6 @@
 package com.kaltura.tvplayer;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKMediaFormat;
 import com.kaltura.playkit.PKPluginConfigs;
 import com.kaltura.playkit.PKRequestConfig;
@@ -21,6 +22,7 @@
 import com.kaltura.tvplayer.config.MediaEntryCacheConfig;
 import com.kaltura.tvplayer.config.TVPlayerParams;
 
+@UnstableApi
 public class PlayerInitOptions {
 
     public final Integer partnerId;

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerTokenResolver.java b/tvplayer/src/main/java/com/kaltura/tvplayer/PlayerTokenResolver.java
@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKMediaEntry;
 import com.kaltura.tvplayer.config.PhoenixTVPlayerParams;
 import com.kaltura.tvplayer.utils.MapTokenResolver;
@@ -10,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
+@UnstableApi
 class PlayerTokenResolver extends MapTokenResolver {
 
     private List<String> entryKeys = new ArrayList<>();

diff --git a/tvplayer/src/main/java/com/kaltura/tvplayer/offline/AbstractOfflineManager.java b/tvplayer/src/main/java/com/kaltura/tvplayer/offline/AbstractOfflineManager.java
@@ -10,6 +10,7 @@
 import androidx.annotation.Nullable;
 
 import com.google.gson.Gson;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.*;
 import com.kaltura.playkit.player.MediaSupport;
 import com.kaltura.playkit.player.SourceSelector;
@@ -23,6 +24,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+@UnstableApi
 public abstract class AbstractOfflineManager extends OfflineManager {
     private static final PKLog log = PKLog.get("AbstractOfflineManager");