Revert "1.4.0 (#6)"

This reverts commit dc8a777.

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,8 +19,6 @@ body:
       options:
         - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
-        - Media3 1.4.0
-        - Media3 1.3.1
         - Media3 1.3.0
         - Media3 1.2.1
         - Media3 1.2.0

README.md

@@ -123,7 +123,9 @@ 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 as ExtensionAware).extra["androidxMediaModulePrefix"] = "media3-"
+gradle.extra.apply {
+  set("androidxMediaModulePrefix", "media-")
+}
 apply(from = file("path/to/media/core_settings.gradle"))
 ```
 
@@ -152,26 +154,6 @@ implementation project(':media-lib-exoplayer-dash')
 implementation project(':media-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
 
 #### Project branches

build.gradle

@@ -17,9 +17,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }
 }
 allprojects {

common_library_config.gradle

@@ -29,6 +29,7 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -43,4 +44,5 @@ android {
 
 dependencies {
     androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }

constants.gradle

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.4.0'
-    releaseVersionCode = 1_004_000_3_00
+    releaseVersion = '1.3.0'
+    releaseVersionCode = 1_003_000_3_00
     minSdkVersion = 19
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
@@ -28,16 +28,14 @@ project.ext {
     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 = '33.0.0-android'
-    kotlinxCoroutinesVersion = '1.8.1'
-    leakCanaryVersion = '2.10'
+    guavaVersion = '32.1.3-android'
     mockitoVersion = '3.12.4'
     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.9.0'
+    kotlinAnnotationsVersion = '1.8.20'
     // Updating this to 1.4.0+ will import Kotlin stdlib [internal ref: b/277891049].
     androidxAnnotationVersion = '1.3.0'
     androidxAnnotationExperimentalVersion = '1.3.1'
@@ -47,8 +45,9 @@ project.ext {
     // Updating this to 1.9.0+ will import Kotlin stdlib [internal ref: b/277891049].
     androidxCoreVersion = '1.8.0'
     androidxExifInterfaceVersion = '1.3.6'
-    androidxLifecycleVersion = '2.6.0'
+    androidxFuturesVersion = '1.1.0'
     androidxMediaVersion = '1.7.0'
+    androidxMedia2Version = '1.2.1'
     androidxMultidexVersion = '2.0.1'
     androidxRecyclerViewVersion = '1.3.0'
     androidxMaterialVersion = '1.8.0'
@@ -57,8 +56,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.4.0'
+    truthVersion = '1.1.3'
     okhttpVersion = '4.12.0'
     modulePrefix = ':'
     if (gradle.ext.has('androidxMediaModulePrefix')) {

core_settings.gradle

@@ -72,10 +72,8 @@ 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')
-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-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'
@@ -102,3 +100,7 @@ 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')

demos/cast/build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'com.android.application'
 android {
     namespace 'androidx.media3.demo.cast'
 
-    compileSdk project.ext.compileSdkVersion
+    compileSdkVersion project.ext.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8