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

* 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 * Custom branch release publish updated
kaltura · Dec 23, 2024 · cd42a24 · cd42a24
1 parent 6248e52
commit cd42a24
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 28 deletions.
diff --git a/.github/publish.sh b/.github/publish.sh
@@ -43,7 +43,7 @@ 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:.*?-SNAPSHOT/.playkit:playkit:$NEW_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
@@ -50,6 +50,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
@@ -7,14 +7,14 @@ ext["signingKeyId"] = System.getenv('SIGNING_KEYID')
 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:31:58 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/playkitvr/build.gradle b/playkitvr/build.gradle
@@ -2,14 +2,15 @@ apply plugin: 'com.android.library'
 apply from: 'version.gradle'
 
 android {
-    compileSdkVersion 33
+    namespace 'com.kaltura.playkitvr'
+    compileSdk 34
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName libVersion
 
@@ -23,6 +24,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+    publishing {
+        publishing {
+            singleVariant('release') {
+            }
+        }
+    }
 }
 
 tasks.withType(Javadoc) {
@@ -31,7 +41,7 @@ tasks.withType(Javadoc) {
 
 dependencies {
 
-    implementation 'com.kaltura:playkit-android:dev-SNAPSHOT'
+    implementation 'com.kaltura:playkit-android:KUX-1761-SNAPSHOT'
     //implementation project(":playkit")
 
     //implementation 'com.kaltura:MD360Player4Android:master'

diff --git a/playkitvr/gradle-mvn-local.gradle b/playkitvr/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/playkitvr/gradle-mvn-push.gradle b/playkitvr/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
 
@@ -97,12 +97,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/playkitvr/src/main/AndroidManifest.xml b/playkitvr/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kaltura.playkitvr" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
 
diff --git a/playkitvr/src/main/java/com/kaltura/playkitvr/DefaultVRPlayerFactory.java b/playkitvr/src/main/java/com/kaltura/playkitvr/DefaultVRPlayerFactory.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.player.BaseExoplayerView;
 import com.kaltura.playkit.player.PlayerEngine;
 import com.kaltura.playkit.player.vr.VRPlayerFactory;
@@ -13,6 +14,7 @@
  * Created by anton.afanasiev on 23/07/2017.
  */
 
+@UnstableApi
 public class DefaultVRPlayerFactory implements VRPlayerFactory {
 
     @Override

diff --git a/playkitvr/src/main/java/com/kaltura/playkitvr/DefaultVRPlayerWrapper.java b/playkitvr/src/main/java/com/kaltura/playkitvr/DefaultVRPlayerWrapper.java
@@ -6,6 +6,7 @@
 
 import com.asha.vrlib.MDVRLibrary;
 import com.asha.vrlib.model.BarrelDistortionConfig;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.PKController;
 import com.kaltura.playkit.PKLog;
 import com.kaltura.playkit.PlayerEngineWrapper;
@@ -20,6 +21,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@UnstableApi
 class DefaultVRPlayerWrapper extends PlayerEngineWrapper {
 
     private PKLog log = PKLog.get(DefaultVRPlayerWrapper.class.getSimpleName());

diff --git a/playkitvr/src/main/java/com/kaltura/playkitvr/VRView.java b/playkitvr/src/main/java/com/kaltura/playkitvr/VRView.java
@@ -16,14 +16,15 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.kaltura.android.exoplayer2.ExoPlayer;
-import com.kaltura.android.exoplayer2.Player;
-import com.kaltura.android.exoplayer2.text.Cue;
-import com.kaltura.android.exoplayer2.text.CueGroup;
-import com.kaltura.android.exoplayer2.ui.AspectRatioFrameLayout;
-import com.kaltura.android.exoplayer2.video.VideoSize;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
+import com.kaltura.androidx.media3.exoplayer.ExoPlayer;
+import com.kaltura.androidx.media3.common.Player;
+import com.kaltura.androidx.media3.common.text.Cue;
+import com.kaltura.androidx.media3.common.text.CueGroup;
+import com.kaltura.androidx.media3.ui.AspectRatioFrameLayout;
+import com.kaltura.androidx.media3.common.VideoSize;
 import com.kaltura.playkit.PKLog;
-import com.kaltura.android.exoplayer2.ui.SubtitleView;
+import com.kaltura.androidx.media3.ui.SubtitleView;
 import com.kaltura.playkit.player.BaseExoplayerView;
 import com.kaltura.playkit.player.PKSubtitlePosition;
 
@@ -32,6 +33,7 @@
 
 import javax.annotation.Nonnull;
 
+@UnstableApi
 class VRView extends BaseExoplayerView {
 
     private static final PKLog log = PKLog.get("VRView");