diff --git a/.sauce/config.yml b/.sauce/config.yml index af6336f6..de8b45bb 100644 --- a/.sauce/config.yml +++ b/.sauce/config.yml @@ -3,7 +3,7 @@ kind: espresso sauce: region: us-west-1 concurrency: 2 - retries: 3 + retries: 1 metadata: tags: diff --git a/automatedtests/build.gradle b/automatedtests/build.gradle index b883b263..c1c334f7 100644 --- a/automatedtests/build.gradle +++ b/automatedtests/build.gradle @@ -73,8 +73,6 @@ dependencies { androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' androidTestImplementation 'androidx.test.ext:junit:1.1.2' - api("com.mux.stats.sdk.muxstats:data-media3:${project.ext.get("muxDataVersion")}") - api 'org.checkerframework:checker-qual:3.33.0' // Automated tests should always test the local module and not the maven dependency. implementation project(":library") diff --git a/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/LatencyTests.java b/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/LatencyTests.java index 20e08fd5..758a261f 100644 --- a/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/LatencyTests.java +++ b/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/LatencyTests.java @@ -8,6 +8,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class LatencyTests extends TestBase { diff --git a/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/SimplePlayerTestActivity.java b/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/SimplePlayerTestActivity.java index 475a7928..4807e413 100644 --- a/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/SimplePlayerTestActivity.java +++ b/automatedtests/src/androidTest/java/com/mux/player/media3/automatedtests/SimplePlayerTestActivity.java @@ -19,6 +19,7 @@ import androidx.core.graphics.drawable.DrawableCompat; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaMetadata; +import androidx.media3.common.PlaybackException; import androidx.media3.common.Player; import androidx.media3.datasource.DefaultDataSource; import androidx.media3.exoplayer.DefaultRenderersFactory; @@ -165,6 +166,14 @@ public void initExoPlayer() { .build(); player.addAnalyticsListener(this); + + player.addListener(new Player.Listener() { + @Override + public void onPlayerError(PlaybackException error) { + throw new RuntimeException("Playback error while trying to test", error); + } + }); + playerView.setPlayer(player); } diff --git a/build.gradle.kts b/build.gradle.kts index 9b5c5440..f6d0900a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - id("com.android.application") version "8.5.2" apply false - id("org.jetbrains.kotlin.android") version "2.0.10" apply false - id("com.android.library") version "8.5.2" apply false - id("com.mux.gradle.android.mux-android-distribution") version "1.2.1" apply false + id("com.android.application") version "8.7.2" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false + id("com.android.library") version "8.7.2" apply false + id("com.mux.gradle.android.mux-android-distribution") version "1.3.0" apply false } allprojects { ext { - set("muxDataVersion", "1.1.0") + set("muxDataVersion", "1.6.0") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index ad74cd21..86934a50 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -77,19 +77,18 @@ muxDistribution { dependencies { - def media3Version = "1.1.1"; + def media3Version = "1.4.1" + def media3DataSdk = "at_1_4" api "androidx.media3:media3-common:${media3Version}" api "androidx.media3:media3-exoplayer:${media3Version}" api "androidx.media3:media3-ui:${media3Version}" api "androidx.media3:media3-exoplayer-hls:${media3Version}" - api "androidx.media3:media3-exoplayer-dash:${media3Version}" api "androidx.media3:media3-exoplayer-ima:${media3Version}" api "androidx.media3:media3-cast:${media3Version}" - api "androidx.media3:media3-extractor:${media3Version}" - api("com.mux.stats.sdk.muxstats:data-media3:${project.ext.get("muxDataVersion")}") + api("com.mux.stats.sdk.muxstats:data-media3-$media3DataSdk:${project.ext.get("muxDataVersion")}") - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" testImplementation 'junit:junit:4.13.2' testImplementation 'androidx.test.ext:junit:1.1.5'