ASTRO-1204: Astro -support Android 14 in player playkit SDK

kaltura · Oct 1, 2024 · 555ae69 · 555ae69
1 parent 96d4046
commit 555ae69
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 16 deletions.
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
@@ -49,6 +49,13 @@ jobs:
         run: |
           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: |

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         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 'io.github.gradle-nexus:publish-plugin:1.1.0'
         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.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/imaplugin/build.gradle b/imaplugin/build.gradle
@@ -3,20 +3,29 @@ apply plugin: 'kotlin-android'
 apply from: 'version.gradle'
 
 android {
-    compileSdkVersion 33
+    namespace 'com.kaltura.playkit.plugin.ima'
+    compileSdk 34
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionName libVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String","VERSION_NAME","\"${libVersion}\"")
     }
-
+    buildFeatures {
+        buildConfig true
+    }
+    publishing {
+        publishing {
+            singleVariant('release') {
+            }
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -40,7 +49,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     //Ads library.
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.29.0'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.35.0'
 
     testImplementation 'junit:junit:4.13.2'
     implementation 'androidx.annotation:annotation:1.3.0'

diff --git a/imaplugin/gradle-mvn-local.gradle b/imaplugin/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/imaplugin/gradle-mvn-push.gradle b/imaplugin/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/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoAdPlaybackAnalyticsListener.kt b/imaplugin/src/main/java/com/kaltura/playkit/plugins/ima/ExoAdPlaybackAnalyticsListener.kt
@@ -2,12 +2,13 @@ package com.kaltura.playkit.plugins.ima
 
 import androidx.annotation.Nullable
 import com.kaltura.androidx.media3.common.Format
+import com.kaltura.androidx.media3.common.util.UnstableApi
 import com.kaltura.androidx.media3.exoplayer.analytics.AnalyticsListener
 import com.kaltura.androidx.media3.exoplayer.DecoderReuseEvaluation
 import com.kaltura.androidx.media3.exoplayer.trackselection.DefaultTrackSelector
 import com.kaltura.androidx.media3.exoplayer.util.EventLogger
 
-class ExoAdPlaybackAnalyticsListener: EventLogger() {
+@UnstableApi 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
@@ -18,6 +18,7 @@
 import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
 import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
 import com.kaltura.androidx.media3.common.C;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.androidx.media3.exoplayer.DefaultRenderersFactory;
 import com.kaltura.androidx.media3.exoplayer.ExoPlayer;
 import com.kaltura.androidx.media3.common.Format;
@@ -49,7 +50,7 @@
 
 import static com.kaltura.androidx.media3.common.util.Log.LOG_LEVEL_OFF;
 
-/**
+@UnstableApi /**
  * Video adPlayer that can play content video and ads.
  */
 public class ExoPlayerWithAdPlayback extends RelativeLayout implements Player.Listener, ExoAdPlaybackAnalyticsListener.VideoFormatChangedListener {

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
@@ -37,6 +37,7 @@
 import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.MessageBus;
 import com.kaltura.playkit.PKError;
 import com.kaltura.playkit.PKErrorCategory;
@@ -77,6 +78,7 @@
 import java.util.List;
 import java.util.Map;
 
+@UnstableApi
 /**
  * Created by gilad.nadav on 17/11/2016.
  */

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
@@ -22,6 +22,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.kaltura.androidx.media3.common.C;
+import com.kaltura.androidx.media3.common.util.UnstableApi;
 import com.kaltura.playkit.MessageBus;
 import com.kaltura.playkit.PKDrmParams;
 import com.kaltura.playkit.PKError;
@@ -66,6 +67,7 @@
 import java.util.ListIterator;
 import java.util.Map;
 
+@UnstableApi
 public class IMADAIPlugin extends PKPlugin implements com.google.ads.interactivemedia.v3.api.AdEvent.AdEventListener, AdErrorEvent.AdErrorListener, AdsProvider {
     private static final PKLog log = PKLog.get("IMADAIPlugin");
     private static final int KB_MULTIPLIER = 1024;