DiceTechnology
diff --git a/‎.github/ISSUE_TEMPLATE/bug.yml
+6-2 b/‎.github/ISSUE_TEMPLATE/bug.yml
+6-2
diff --git a/‎README.md
+28-11 b/‎README.md
+28-11
diff --git a/‎RELEASENOTES.md
+747 b/‎RELEASENOTES.md
+747
diff --git a/‎api.txt
+50-7 b/‎api.txt
+50-7
diff --git a/‎build.gradle
+2-2 b/‎build.gradle
+2-2
diff --git a/‎common_library_config.gradle
+3-2 b/‎common_library_config.gradle
+3-2
diff --git a/‎constants.gradle
+14-12 b/‎constants.gradle
+14-12
diff --git a/‎core_settings.gradle
+6-6 b/‎core_settings.gradle
+6-6
diff --git a/‎demos/cast/build.gradle
+1-1 b/‎demos/cast/build.gradle
+1-1
diff --git a/‎demos/cast/src/main/java/androidx/media3/demo/cast/MainActivity.java
+2-1 b/‎demos/cast/src/main/java/androidx/media3/demo/cast/MainActivity.java
+2-1
diff --git a/‎demos/compose/README.md
+14 b/‎demos/compose/README.md
+14
diff --git a/‎demos/compose/build.gradle
+76 b/‎demos/compose/build.gradle
+76
diff --git a/‎demos/compose/src/main/AndroidManifest.xml
+38 b/‎demos/compose/src/main/AndroidManifest.xml
+38
@@ -17,10 +17,14 @@ body:
       label: Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
-        - Media3 1.2.1
-        - Media3 1.2.0
         - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.4.1
+        - Media3 1.4.0
+        - Media3 1.3.1
+        - Media3 1.3.0
+        - Media3 1.2.1
+        - Media3 1.2.0
         - Media3 1.1.1 / ExoPlayer 2.19.1
         - Media3 1.1.0 / ExoPlayer 2.19.0
         - Media3 1.0.2 / ExoPlayer 2.18.7
 
@@ -116,23 +116,20 @@ First, clone the repository into a local directory:
 
 ```sh
 git clone https://github.com/androidx/media.git
-cd media
 ```
 
 Next, add the following to your project's `settings.gradle.kts` file, replacing
 `path/to/media` with the path to your local copy:
 
 ```kotlin
-gradle.extra.apply {
-  set("androidxMediaModulePrefix", "media-")
-}
+(gradle as ExtensionAware).extra["androidxMediaModulePrefix"] = "media3-"
 apply(from = file("path/to/media/core_settings.gradle"))
 ```
 
 Or in Gradle Groovy DSL `settings.gradle`:
 
 ```groovy
-gradle.ext.androidxMediaModulePrefix = 'media-'
+gradle.ext.androidxMediaModulePrefix = 'media3-'
 apply from: file("path/to/media/core_settings.gradle")
 ```
 
@@ -141,17 +138,37 @@ You can depend on them from `build.gradle.kts` as you would on any other local
 module, for example:
 
 ```kotlin
-implementation(project(":media-lib-exoplayer"))
-implementation(project(":media-lib-exoplayer-dash"))
-implementation(project(":media-lib-ui"))
+implementation(project(":media3-lib-exoplayer"))
+implementation(project(":media3-lib-exoplayer-dash"))
+implementation(project(":media3-lib-ui"))
 ```
 
 Or in Gradle Groovy DSL `build.gradle`:
 
 ```groovy
-implementation project(':media-lib-exoplayer')
-implementation project(':media-lib-exoplayer-dash')
-implementation project(':media-lib-ui')
+implementation project(':media3-lib-exoplayer')
+implementation project(':media3-lib-exoplayer-dash')
+implementation project(':media3-lib-ui')
+```
+
+#### MIDI module
+
+By default the [MIDI module](libraries/decoder_midi) is disabled as a local
+dependency, because it requires additional Maven repository config. If you want
+to use it as a local dependency, please configure the JitPack repository as
+[described in the module README](libraries/decoder_midi/README.md#getting-the-module),
+and then enable building the module in your `settings.gradle.kts` file:
+
+```kotlin
+gradle.extra.apply {
+  set("androidxMediaEnableMidiModule", true)
+}
+```
+
+Or in Gradle Groovy DSL `settings.gradle`:
+
+```groovy
+gradle.ext.androidxMediaEnableMidiModule = true
 ```
 
 ## Developing AndroidX Media
 
@@ -17,9 +17,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
     }
 }
 allprojects {
 
@@ -24,11 +24,13 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         consumerProguardFiles 'proguard-rules.txt'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        aarMetadata {
+            minCompileSdk = project.ext.compileSdkVersion
+        }
         multiDexEnabled true
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -43,5 +45,4 @@ android {
 
 dependencies {
     androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.2.1-dr10'
-    releaseVersionCode = 1_002_001_3_00
-    minSdkVersion = 16
+    releaseVersion = '1.4.1-dr1'
+    releaseVersionCode = 1_004_001_3_00
+    minSdkVersion = 19
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
     appTargetSdkVersion = 34
@@ -23,17 +23,21 @@ project.ext {
     targetSdkVersion = 30
     compileSdkVersion = 34
     dexmakerVersion = '2.28.3'
+    // Use the same JUnit version as the Android repo:
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/junit/METADATA
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/main/+/main:external/guava/METADATA
-    guavaVersion = '31.1-android'
+    guavaVersion = '33.0.0-android'
+    kotlinxCoroutinesVersion = '1.8.1'
+    leakCanaryVersion = '2.10'
     mockitoVersion = '3.12.4'
-    robolectricVersion = '4.10.3'
+    robolectricVersion = '4.11'
     // Keep this in sync with Google's internal Checker Framework version.
     checkerframeworkVersion = '3.13.0'
     errorProneVersion = '2.18.0'
     jsr305Version = '3.0.2'
-    kotlinAnnotationsVersion = '1.8.20'
+    kotlinAnnotationsVersion = '1.9.0'
     // Updating this to 1.4.0+ will import Kotlin stdlib [internal ref: b/277891049].
     androidxAnnotationVersion = '1.3.0'
     androidxAnnotationExperimentalVersion = '1.3.1'
@@ -43,9 +47,8 @@ project.ext {
     // Updating this to 1.9.0+ will import Kotlin stdlib [internal ref: b/277891049].
     androidxCoreVersion = '1.8.0'
     androidxExifInterfaceVersion = '1.3.6'
-    androidxFuturesVersion = '1.1.0'
-    androidxMediaVersion = '1.6.0'
-    androidxMedia2Version = '1.2.1'
+    androidxLifecycleVersion = '2.6.0'
+    androidxMediaVersion = '1.7.0'
     androidxMultidexVersion = '2.0.1'
     androidxRecyclerViewVersion = '1.3.0'
     androidxMaterialVersion = '1.8.0'
@@ -54,10 +57,9 @@ project.ext {
     androidxTestJUnitVersion = '1.1.5'
     androidxTestRunnerVersion = '1.5.2'
     androidxTestRulesVersion = '1.5.0'
-    androidxTestServicesStorageVersion = '1.4.2'
     androidxTestTruthVersion = '1.5.0'
-    truthVersion = '1.1.3'
-    okhttpVersion = '4.11.0'
+    truthVersion = '1.4.0'
+    okhttpVersion = '4.12.0'
     modulePrefix = ':'
     if (gradle.ext.has('androidxMediaModulePrefix')) {
         modulePrefix += gradle.ext.androidxMediaModulePrefix
 
@@ -57,6 +57,8 @@ include modulePrefix + 'lib-datasource'
 project(modulePrefix + 'lib-datasource').projectDir = new File(rootDir, 'libraries/datasource')
 include modulePrefix + 'lib-datasource-cronet'
 project(modulePrefix + 'lib-datasource-cronet').projectDir = new File(rootDir, 'libraries/datasource_cronet')
+include modulePrefix + 'lib-datasource-httpengine'
+project(modulePrefix + 'lib-datasource-httpengine').projectDir = new File(rootDir, 'libraries/datasource_httpengine')
 include modulePrefix + 'lib-datasource-rtmp'
 project(modulePrefix + 'lib-datasource-rtmp').projectDir = new File(rootDir, 'libraries/datasource_rtmp')
 include modulePrefix + 'lib-datasource-okhttp'
@@ -70,8 +72,10 @@ include modulePrefix + 'lib-decoder-ffmpeg'
 project(modulePrefix + 'lib-decoder-ffmpeg').projectDir = new File(rootDir, 'libraries/decoder_ffmpeg')
 include modulePrefix + 'lib-decoder-flac'
 project(modulePrefix + 'lib-decoder-flac').projectDir = new File(rootDir, 'libraries/decoder_flac')
-include modulePrefix + 'lib-decoder-midi'
-project(modulePrefix + 'lib-decoder-midi').projectDir = new File(rootDir, 'libraries/decoder_midi')
+if (gradle.ext.has('androidxMediaEnableMidiModule') && gradle.ext.androidxMediaEnableMidiModule) {
+    include modulePrefix + 'lib-decoder-midi'
+    project(modulePrefix + 'lib-decoder-midi').projectDir = new File(rootDir, 'libraries/decoder_midi')
+}
 include modulePrefix + 'lib-decoder-opus'
 project(modulePrefix + 'lib-decoder-opus').projectDir = new File(rootDir, 'libraries/decoder_opus')
 include modulePrefix + 'lib-decoder-vp9'
@@ -98,7 +102,3 @@ include modulePrefix + 'test-data'
 project(modulePrefix + 'test-data').projectDir = new File(rootDir, 'libraries/test_data')
 include modulePrefix + 'test-utils'
 project(modulePrefix + 'test-utils').projectDir = new File(rootDir, 'libraries/test_utils')
-include modulePrefix + 'test-session-common'
-project(modulePrefix + 'test-session-common').projectDir = new File(rootDir, 'libraries/test_session_common')
-include modulePrefix + 'test-session-current'
-project(modulePrefix + 'test-session-current').projectDir = new File(rootDir, 'libraries/test_session_current')
@@ -17,7 +17,7 @@ apply plugin: 'com.android.application'
 android {
     namespace 'androidx.media3.demo.cast'
 
-    compileSdkVersion project.ext.compileSdkVersion
+    compileSdk project.ext.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
 
@@ -44,6 +44,7 @@
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.dynamite.DynamiteModule;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * An activity that plays video using {@link ExoPlayer} and supports casting using ExoPlayer's Cast
@@ -65,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     // Getting the cast context later than onStart can cause device discovery not to take place.
     try {
-      castContext = CastContext.getSharedInstance(this);
+      castContext = CastContext.getSharedInstance(this, MoreExecutors.directExecutor()).getResult();
     } catch (RuntimeException e) {
       Throwable cause = e.getCause();
       while (cause != null) {
 
@@ -0,0 +1,14 @@
+# ExoPlayer demo with Compose integration
+
+This is an experimental ExoPlayer demo app that is built fully using Compose
+features. This should be taken as Work-In-Progress, rather than experimental API
+for testing out application development with the media3 and Jetpack Compose
+libraries. Please await further announcement via Release Notes for when the
+implementation is fully integrated into the library.
+
+For an intermediate solution, use Jetpack Compose Interop with AndroidView and
+PlayerView. However, note that it provides limited functionality and some
+features may not be supported.
+
+See the [demos README](../README.md) for instructions on how to build and run
+this demo.
@@ -0,0 +1,76 @@
+// Copyright 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    namespace 'androidx.media3.demo.compose'
+
+    compileSdk project.ext.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
+        minSdkVersion 21
+        targetSdkVersion project.ext.appTargetSdkVersion
+    }
+
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            signingConfig signingConfigs.debug
+        }
+        debug {
+            jniDebuggable = true
+        }
+    }
+
+    lintOptions {
+        // The demo app isn't indexed, and doesn't have translations.
+        disable 'GoogleAppIndexingWarning','MissingTranslation'
+    }
+    buildFeatures {
+        viewBinding true
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.0"
+    }
+}
+
+dependencies {
+    def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
+    implementation composeBom
+
+    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation 'androidx.compose.foundation:foundation-android:1.6.7'
+    implementation 'androidx.compose.material3:material3-android:1.2.1'
+    implementation 'com.google.android.material:material:' + androidxMaterialVersion
+
+    implementation project(modulePrefix + 'lib-exoplayer')
+
+    // For detecting and debugging leaks only. LeakCanary is not needed for demo app to work.
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:' + leakCanaryVersion
+}
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          https://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="androidx.media3.demo.compose">
+
+  <uses-sdk/>
+  <uses-permission android:name="android.permission.INTERNET" />
+
+  <application
+      android:allowBackup="false"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/Theme.Media3ComposeDemo">
+
+    <activity
+        android:name="androidx.media3.demo.compose.MainActivity"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ buildscript {`
`17`	`17`	`mavenCentral()`
`18`	`18`	`}`
`19`	`19`	`dependencies {`
`20`		`- classpath 'com.android.tools.build:gradle:8.0.1'`
	`20`	`+ classpath 'com.android.tools.build:gradle:8.3.2'`
`21`	`21`	`classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.4'`
`22`		`- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'`
	`22`	`+ classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`allprojects {`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,13 @@ android {`
`24`	`24`	`targetSdkVersion project.ext.targetSdkVersion`
`25`	`25`	`consumerProguardFiles 'proguard-rules.txt'`
`26`	`26`	`testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
	`27`	`+ aarMetadata {`
	`28`	`+ minCompileSdk = project.ext.compileSdkVersion`
	`29`	`+ }`
`27`	`30`	`multiDexEnabled true`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`compileOptions {`
`31`		`- coreLibraryDesugaringEnabled true`
`32`	`34`	`sourceCompatibility JavaVersion.VERSION_1_8`
`33`	`35`	`targetCompatibility JavaVersion.VERSION_1_8`
`34`	`36`	`}`
`@@ -43,5 +45,4 @@ android {`
`43`	`45`
`44`	`46`	`dependencies {`
`45`	`47`	`androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion`
`46`		`- coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'`
`47`	`48`	`}`