Skip to content

Commit

Permalink
Twelve: Update media3 to 1.5.0-beta01
Browse files Browse the repository at this point in the history
Change-Id: Ie2ff2dda7cdd588ef28d17b2571d38292aa5b292
  • Loading branch information
luca020400 committed Nov 9, 2024
1 parent e7b514b commit ea1532e
Show file tree
Hide file tree
Showing 70 changed files with 58 additions and 30 deletions.
83 changes: 54 additions & 29 deletions app/libs/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

android_library_import {
name: "Twelve_androidx.media3_media3-common-nodeps",
aars: ["androidx/media3/media3-common/1.5.0-alpha01/media3-common-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-common/1.5.0-beta01/media3-common-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -29,7 +29,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-common/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-common/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-common-nodeps",
"androidx.annotation_annotation",
Expand All @@ -41,7 +41,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-common-ktx-nodeps",
aars: ["androidx/media3/media3-common-ktx/1.5.0-alpha01/media3-common-ktx-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-common-ktx/1.5.0-beta01/media3-common-ktx-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -65,7 +65,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-common-ktx/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-common-ktx/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-common-ktx-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -79,7 +79,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-container-nodeps",
aars: ["androidx/media3/media3-container/1.5.0-alpha01/media3-container-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-container/1.5.0-beta01/media3-container-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -100,7 +100,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-container/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-container/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-container-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -111,7 +111,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-database-nodeps",
aars: ["androidx/media3/media3-database/1.5.0-alpha01/media3-database-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-database/1.5.0-beta01/media3-database-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -132,7 +132,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-database/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-database/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-database-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -143,7 +143,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-datasource-nodeps",
aars: ["androidx/media3/media3-datasource/1.5.0-alpha01/media3-datasource-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-datasource/1.5.0-beta01/media3-datasource-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -166,7 +166,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-datasource/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-datasource/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-datasource-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -179,7 +179,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-decoder-nodeps",
aars: ["androidx/media3/media3-decoder/1.5.0-alpha01/media3-decoder-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-decoder/1.5.0-beta01/media3-decoder-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -200,7 +200,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-decoder/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-decoder/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-decoder-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -211,7 +211,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-exoplayer-nodeps",
aars: ["androidx/media3/media3-exoplayer/1.5.0-alpha01/media3-exoplayer-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-exoplayer/1.5.0-beta01/media3-exoplayer-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand Down Expand Up @@ -240,7 +240,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-exoplayer/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-exoplayer/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-exoplayer-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -259,7 +259,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-exoplayer-hls-nodeps",
aars: ["androidx/media3/media3-exoplayer-hls/1.5.0-alpha01/media3-exoplayer-hls-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-exoplayer-hls/1.5.0-beta01/media3-exoplayer-hls-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -280,7 +280,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-exoplayer-hls/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-exoplayer-hls/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-exoplayer-hls-nodeps",
"Twelve_androidx.media3_media3-exoplayer",
Expand All @@ -291,7 +291,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-exoplayer-midi-nodeps",
aars: ["androidx/media3/media3-exoplayer-midi/1.5.0-alpha01/media3-exoplayer-midi-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-exoplayer-midi/1.5.0-beta01/media3-exoplayer-midi-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -316,7 +316,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-exoplayer-midi/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-exoplayer-midi/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-exoplayer-midi-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -331,7 +331,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-exoplayer-rtsp-nodeps",
aars: ["androidx/media3/media3-exoplayer-rtsp/1.5.0-alpha01/media3-exoplayer-rtsp-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-exoplayer-rtsp/1.5.0-beta01/media3-exoplayer-rtsp-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -352,7 +352,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-exoplayer-rtsp/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-exoplayer-rtsp/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-exoplayer-rtsp-nodeps",
"Twelve_androidx.media3_media3-exoplayer",
Expand All @@ -363,7 +363,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.5.0-alpha01/media3-exoplayer-smoothstreaming-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.5.0-beta01/media3-exoplayer-smoothstreaming-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -384,7 +384,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
"Twelve_androidx.media3_media3-exoplayer",
Expand All @@ -395,7 +395,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-extractor-nodeps",
aars: ["androidx/media3/media3-extractor/1.5.0-alpha01/media3-extractor-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-extractor/1.5.0-beta01/media3-extractor-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -418,7 +418,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-extractor/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-extractor/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-extractor-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -431,7 +431,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-session-nodeps",
aars: ["androidx/media3/media3-session/1.5.0-alpha01/media3-session-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-session/1.5.0-beta01/media3-session-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -455,7 +455,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-session/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-session/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-session-nodeps",
"Twelve_androidx.media3_media3-common",
Expand All @@ -469,7 +469,7 @@ android_library {

android_library_import {
name: "Twelve_androidx.media3_media3-ui-nodeps",
aars: ["androidx/media3/media3-ui/1.5.0-alpha01/media3-ui-1.5.0-alpha01.aar"],
aars: ["androidx/media3/media3-ui/1.5.0-beta01/media3-ui-1.5.0-beta01.aar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand All @@ -492,7 +492,7 @@ android_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
manifest: "androidx/media3/media3-ui/1.5.0-alpha01/AndroidManifest.xml",
manifest: "androidx/media3/media3-ui/1.5.0-beta01/AndroidManifest.xml",
static_libs: [
"Twelve_androidx.media3_media3-ui-nodeps",
"Twelve_androidx.media3_media3-common",
Expand Down Expand Up @@ -622,6 +622,31 @@ android_library {
java_version: "1.7",
}

java_import {
name: "Twelve_com.google.j2objc_j2objc-annotations-nodeps",
jars: ["com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
}

java_library_static {
name: "Twelve_com.google.j2objc_j2objc-annotations",
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
static_libs: [
"Twelve_com.google.j2objc_j2objc-annotations-nodeps",
],
java_version: "1.7",
}

java_import {
name: "Twelve_com.squareup.okhttp3_okhttp-nodeps",
jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],
Expand Down Expand Up @@ -890,7 +915,7 @@ java_library_static {

java_import {
name: "Twelve_org.checkerframework_checker-qual-nodeps",
jars: ["org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar"],
jars: ["org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar"],
sdk_version: "35",
min_sdk_version: "14",
apex_available: [
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2024 Tom Ball

SPDX-License-Identifier: Apache-2.0
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kotlinx-coroutines = "1.8.1"
kotlinx-serialization = "1.6.1"
lifecycle = "2.8.5"
material = "1.12.0"
media3 = "1.5.0-alpha01"
media3 = "1.5.0-beta01"
navigation = "2.8.0"
nier-visualizer = "v0.1.3"
okhttp = "4.12.0"
Expand Down

0 comments on commit ea1532e

Please sign in to comment.