migrate to media3

app/android/build.gradle.kts

@@ -13,11 +13,12 @@ dependencies {
 }
 
 android {
-    compileSdk = 32
+    namespace = "me.mimao.android"
+    compileSdk = 33
     defaultConfig {
         applicationId = "me.mimao.android"
         minSdk = 24
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }

app/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.mimao.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application

app/shared/build.gradle.kts

@@ -61,11 +61,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    namespace = "com.mimao.sample"
+    compileSdk = 33
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 24
-        targetSdk = 32
+        targetSdk = 33
     }
     compileOptions {
         sourceCompatibility = Versions.Java.java

app/shared/src/androidMain/kotlin/com/mimao/kmp/videoplayer/sample/rememberVideoPlayerState.kt

@@ -4,14 +4,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import com.google.android.exoplayer2.ui.StyledPlayerView
+import androidx.media3.ui.PlayerView
 import com.mimao.kmp.videoplayer.KVideoPlayer
 
 @Composable
 actual fun rememberVideoPlayerState(): VideoPlayerState {
     val context = LocalContext.current
     return remember {
-        val view = StyledPlayerView(context)
+        val view = PlayerView(context)
         VideoPlayerState(
             player = KVideoPlayer(view),
             content = {
@@ -24,4 +24,4 @@ actual fun rememberVideoPlayerState(): VideoPlayerState {
             }
         )
     }
-}
+}

buildSrc/build.gradle.kts

@@ -8,6 +8,6 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:7.3.1")
-    api(kotlin("gradle-plugin", version = "1.7.20"))
+    implementation("com.android.tools.build:gradle:8.0.2")
+    api(kotlin("gradle-plugin", version = "1.8.20"))
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,11 +1,11 @@
 import org.gradle.api.JavaVersion
 
 object Versions {
-    const val compose = "1.2.0"
+    const val compose = "1.4.0"
 
     object Kotlin {
-        const val lang = "1.7.20"
-        const val coroutines = "1.6.4"
+        const val lang = "1.8.20"
+        const val coroutines = "1.7.1"
     }
 
     object Java {
@@ -15,6 +15,6 @@ object Versions {
 
     const val android_material3 = "1.0.0-alpha13"
 
-    const val exoPlayer = "2.18.1"
+    const val media3 = "1.0.2"
     const val vlcj = "4.7.1"
 }

gradle.properties

@@ -24,6 +24,6 @@ android.nonTransitiveRClass=true
 kotlin.native.binary.memoryModel=experimental
 kotlin.native.cacheKind=none
 kotlin.mpp.enableCInteropCommonization=true
-android.disableAutomaticComponentCreation=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

kvideoplayer/build.gradle.kts

@@ -57,8 +57,8 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.android.exoplayer:exoplayer:${Versions.exoPlayer}")
-                api("com.google.android.exoplayer:extension-okhttp:${Versions.exoPlayer}")
+                api("androidx.media3:media3-exoplayer:${Versions.media3}")
+                api("androidx.media3:media3-ui:${Versions.media3}")
             }
         }
         val desktopMain by getting {

kvideoplayer/src/androidMain/kotlin/com/mimao/kmp/videoplayer/KVideoPlayer.android.kt

@@ -1,10 +1,10 @@
 package com.mimao.kmp.videoplayer
 
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.PlaybackException
-import com.google.android.exoplayer2.Player
-import com.google.android.exoplayer2.ui.StyledPlayerView
+import androidx.media3.common.MediaItem
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.ui.PlayerView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 
 actual class KVideoPlayer(
-    private val playerView: StyledPlayerView,
+    private val playerView: PlayerView,
 ) {
     private val _status = MutableStateFlow<KPlayerStatus>(KPlayerStatus.Idle)
     actual val status: Flow<KPlayerStatus>
@@ -147,6 +147,6 @@ actual class KVideoPlayer(
     }
 
     private fun emitDuration() {
-        _duration.value = playerView?.player?.duration ?: 0
+        _duration.value = playerView.player?.duration ?: 0
     }
 }