diff options
author | Rakesh Kumar <rakesh.kumar@ittiam.com> | 2023-08-28 19:40:52 +0530 |
---|---|---|
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-11-14 16:09:59 +0000 |
commit | 1f931b955b0cc858c11dcb14f41785e3c7c38006 (patch) | |
tree | 8bfc4244ce3f6828b618f02e161cfbe47a45a5c0 | |
parent | 5336ec267ae2d882aee90ab2a34d265f41c35f08 (diff) | |
download | misc-1f931b955b0cc858c11dcb14f41785e3c7c38006.tar.gz |
Updating prebuilt androidx-media3 to 1.1.1
Deleted media3-test-utils:1.0.2 prebuilts as it is not required by
mediaediting tests after updating to 1.1.1.
Bug: 278751385
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:38fd48bd7b962675c6fed49af1924108d5da05fc)
Merged-In: I0f63b8f107bb4883d8ac0ef478dd27b94081c390
Change-Id: I0f63b8f107bb4883d8ac0ef478dd27b94081c390
63 files changed, 325 insertions, 214 deletions
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp index 71a5408e..89308f2c 100644 --- a/common/androidx-media3/Android.bp +++ b/common/androidx-media3/Android.bp @@ -13,7 +13,7 @@ library_visibility = [ android_library_import { name: "androidx.media3.media3-common-nodeps", - aars: ["androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar"], + aars: ["androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -48,8 +48,42 @@ android_library { } android_library_import { + name: "androidx.media3.media3-container-nodeps", + aars: ["androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar"], + sdk_version: "current", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + min_sdk_version: "16", + static_libs: [ + "androidx.annotation_annotation", + "androidx.media3.media3-common", + ], + visibility: ["//visibility:private"] +} + +android_library { + name: "androidx.media3.media3-container", + sdk_version: "current", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + min_sdk_version: "16", + manifest: "manifests/androidx.media3.media3-container/AndroidManifest.xml", + static_libs: [ + "androidx.media3.media3-container-nodeps", + "androidx.annotation_annotation", + "androidx.media3.media3-common", + ], + java_version: "1.7", + visibility: library_visibility +} + +android_library_import { name: "androidx.media3.media3-database-nodeps", - aars: ["androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar"], + aars: ["androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -83,7 +117,7 @@ android_library { android_library_import { name: "androidx.media3.media3-datasource-nodeps", - aars: ["androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar"], + aars: ["androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -119,7 +153,7 @@ android_library { android_library_import { name: "androidx.media3.media3-decoder-nodeps", - aars: ["androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar"], + aars: ["androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -153,7 +187,7 @@ android_library { android_library_import { name: "androidx.media3.media3-effect-nodeps", - aars: ["androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.aar"], + aars: ["androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -163,6 +197,7 @@ android_library_import { static_libs: [ "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-datasource", ], visibility: ["//visibility:private"] } @@ -180,6 +215,7 @@ android_library { "androidx.media3.media3-effect-nodeps", "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-datasource", ], java_version: "1.7", visibility: library_visibility @@ -187,7 +223,7 @@ android_library { android_library_import { name: "androidx.media3.media3-exoplayer-dash-nodeps", - aars: ["androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.aar"], + aars: ["androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -221,7 +257,7 @@ android_library { android_library_import { name: "androidx.media3.media3-exoplayer-nodeps", - aars: ["androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar"], + aars: ["androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -231,6 +267,7 @@ android_library_import { static_libs: [ "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-container", "androidx.media3.media3-datasource", "androidx.media3.media3-decoder", "androidx.media3.media3-extractor", @@ -253,6 +290,7 @@ android_library { "androidx.media3.media3-exoplayer-nodeps", "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-container", "androidx.media3.media3-datasource", "androidx.media3.media3-decoder", "androidx.media3.media3-extractor", @@ -265,7 +303,7 @@ android_library { android_library_import { name: "androidx.media3.media3-extractor-nodeps", - aars: ["androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar"], + aars: ["androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -275,6 +313,7 @@ android_library_import { static_libs: [ "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-container", "androidx.media3.media3-decoder", ], visibility: ["//visibility:private"] @@ -293,6 +332,7 @@ android_library { "androidx.media3.media3-extractor-nodeps", "androidx.annotation_annotation", "androidx.media3.media3-common", + "androidx.media3.media3-container", "androidx.media3.media3-decoder", ], java_version: "1.7", @@ -300,8 +340,8 @@ android_library { } android_library_import { - name: "androidx.media3.media3-session-nodeps", - aars: ["androidx/media3/media3-session/1.0.2/media3-session-1.0.2.aar"], + name: "androidx.media3.media3-muxer-nodeps", + aars: ["androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -309,35 +349,35 @@ android_library_import { ], min_sdk_version: "16", static_libs: [ - "androidx.collection_collection", + "androidx.annotation_annotation", "androidx.media3.media3-common", - "androidx.media_media", + "androidx.media3.media3-container", ], visibility: ["//visibility:private"] } android_library { - name: "androidx.media3.media3-session", + name: "androidx.media3.media3-muxer", sdk_version: "current", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "16", - manifest: "manifests/androidx.media3.media3-session/AndroidManifest.xml", + manifest: "manifests/androidx.media3.media3-muxer/AndroidManifest.xml", static_libs: [ - "androidx.media3.media3-session-nodeps", - "androidx.collection_collection", + "androidx.media3.media3-muxer-nodeps", + "androidx.annotation_annotation", "androidx.media3.media3-common", - "androidx.media_media", + "androidx.media3.media3-container", ], java_version: "1.7", visibility: library_visibility } android_library_import { - name: "androidx.media3.media3-test-utils-nodeps", - aars: ["androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar"], + name: "androidx.media3.media3-session-nodeps", + aars: ["androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -345,41 +385,27 @@ android_library_import { ], min_sdk_version: "16", static_libs: [ - "androidx.annotation_annotation", - "androidx.media3.media3-exoplayer", - "androidx.test.core", - "androidx.test.ext.junit", - "androidx.test.ext.truth", - "junit", - "mockito-core", - "mockwebserver", - "truth", - "truth-java8-extension", + "androidx.collection_collection", + "androidx.media3.media3-common", + "androidx.media_media", ], visibility: ["//visibility:private"] } android_library { - name: "androidx.media3.media3-test-utils", + name: "androidx.media3.media3-session", sdk_version: "current", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "16", - manifest: "manifests/androidx.media3.media3-test-utils/AndroidManifest.xml", + manifest: "manifests/androidx.media3.media3-session/AndroidManifest.xml", static_libs: [ - "androidx.media3.media3-test-utils-nodeps", - "androidx.annotation_annotation", - "androidx.media3.media3-exoplayer", - "androidx.test.core", - "androidx.test.ext.junit", - "androidx.test.ext.truth", - "junit", - "mockito-core", - "mockwebserver", - "truth", - "truth-java8-extension", + "androidx.media3.media3-session-nodeps", + "androidx.collection_collection", + "androidx.media3.media3-common", + "androidx.media_media", ], java_version: "1.7", visibility: library_visibility @@ -387,7 +413,7 @@ android_library { android_library_import { name: "androidx.media3.media3-transformer-nodeps", - aars: ["androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.aar"], + aars: ["androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", @@ -396,8 +422,11 @@ android_library_import { min_sdk_version: "21", static_libs: [ "androidx.annotation_annotation", + "androidx.media3.media3-datasource", + "androidx.media3.media3-container", "androidx.media3.media3-exoplayer", "androidx.media3.media3-effect", + "androidx.media3.media3-muxer", ], visibility: ["//visibility:private"] } @@ -414,8 +443,11 @@ android_library { static_libs: [ "androidx.media3.media3-transformer-nodeps", "androidx.annotation_annotation", + "androidx.media3.media3-datasource", + "androidx.media3.media3-container", "androidx.media3.media3-exoplayer", "androidx.media3.media3-effect", + "androidx.media3.media3-muxer", ], java_version: "1.7", visibility: library_visibility @@ -423,7 +455,7 @@ android_library { android_library_import { name: "androidx.media3.media3-ui-nodeps", - aars: ["androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar"], + aars: ["androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar"], sdk_version: "current", apex_available: [ "//apex_available:platform", diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2-sources.jar Binary files differdeleted file mode 100644 index 3a32d576..00000000 --- a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar Binary files differdeleted file mode 100644 index 0e402bec..00000000 --- a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..c6450624 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar Binary files differnew file mode 100644 index 00000000..495d6f63 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.pom index d2c8d4ba..ddffb923 100644 --- a/common/androidx-media3/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 common module</name> <description>Media3 common module</description> @@ -33,112 +33,122 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-cast</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-database</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-datasource</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-datasource-cronet</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-datasource-okhttp</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-datasource-rtmp</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-decoder</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-effect</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-dash</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-hls</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-ima</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-rtsp</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-smoothstreaming</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-workmanager</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-extractor</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-muxer</artifactId> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-session</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-transformer</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-ui</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-ui-leanback</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-test-utils</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-test-utils-robolectric</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> </dependency> </dependencies> </dependencyManagement> @@ -146,7 +156,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>31.0.1-android</version> + <version>31.1-android</version> <scope>compile</scope> <exclusions> <exclusion> diff --git a/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..3d7f8eed --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar Binary files differnew file mode 100644 index 00000000..70aca006 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.pom index cab10718..9e5e1223 100644 --- a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.pom @@ -7,11 +7,11 @@ <!-- do_not_remove: published-with-gradle-metadata --> <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> - <artifactId>media3-effect</artifactId> - <version>1.0.2</version> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> <packaging>aar</packaging> - <name>Media3 Effect module</name> - <description>Media3 Effect module</description> + <name>Media3 Container module</name> + <description>Media3 Container module</description> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -30,17 +30,17 @@ </scm> <dependencies> <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.3.0</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> + <dependency> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.3.0</version> + <scope>runtime</scope> + </dependency> </dependencies> </project> diff --git a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar Binary files differdeleted file mode 100644 index c4c9c37c..00000000 --- a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1-sources.jar Binary files differindex 3d9169e0..65def0c7 100644 --- a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2-sources.jar +++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar Binary files differnew file mode 100644 index 00000000..b256e44a --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.pom index 7504de9f..0e08279c 100644 --- a/common/androidx-media3/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-database</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 database module</name> <description>Media3 database module</description> @@ -32,7 +32,7 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar Binary files differdeleted file mode 100644 index 7a24948a..00000000 --- a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1-sources.jar Binary files differindex cdda7d3a..24532466 100644 --- a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2-sources.jar +++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar Binary files differnew file mode 100644 index 00000000..fb435088 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.pom index 30eb5378..2fe36089 100644 --- a/common/androidx-media3/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-datasource</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 DataSource module</name> <description>Media3 DataSource module</description> @@ -32,14 +32,14 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-database</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar Binary files differdeleted file mode 100644 index fec38621..00000000 --- a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1-sources.jar Binary files differindex f978574e..e59f883e 100644 --- a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2-sources.jar +++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar Binary files differnew file mode 100644 index 00000000..cbc13ee6 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.pom index ad7f6de4..70e0a102 100644 --- a/common/androidx-media3/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-decoder</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 decoder module</name> <description>Media3 decoder module</description> @@ -32,7 +32,7 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2-sources.jar Binary files differdeleted file mode 100644 index c1d0c255..00000000 --- a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.aar Binary files differdeleted file mode 100644 index 6be86bf4..00000000 --- a/common/androidx-media3/androidx/media3/media3-effect/1.0.2/media3-effect-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..7011bb96 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar Binary files differnew file mode 100644 index 00000000..0c966250 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.pom index af2eb151..2c7e248d 100644 --- a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-effect/1.1.1/media3-effect-1.1.1.pom @@ -7,11 +7,11 @@ <!-- do_not_remove: published-with-gradle-metadata --> <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> - <artifactId>media3-transformer</artifactId> - <version>1.0.2</version> + <artifactId>media3-effect</artifactId> + <version>1.1.1</version> <packaging>aar</packaging> - <name>Media3 Transformer module</name> - <description>Media3 Transformer module</description> + <name>Media3 Effect module</name> + <description>Media3 Effect module</description> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -37,15 +37,15 @@ </dependency> <dependency> <groupId>androidx.media3</groupId> - <artifactId>media3-exoplayer</artifactId> - <version>1.0.2</version> + <artifactId>media3-common</artifactId> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> - <artifactId>media3-effect</artifactId> - <version>1.0.2</version> + <artifactId>media3-datasource</artifactId> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2-sources.jar Binary files differdeleted file mode 100644 index 4629683f..00000000 --- a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.aar Binary files differdeleted file mode 100644 index 6caee2be..00000000 --- a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..7974e68f --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar Binary files differnew file mode 100644 index 00000000..3f6e6d15 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.pom index 9328e7d2..f6e0c628 100644 --- a/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.0.2/media3-exoplayer-dash-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-exoplayer-dash/1.1.1/media3-exoplayer-dash-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer-dash</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 ExoPlayer DASH module</name> <description>Media3 ExoPlayer DASH module</description> @@ -32,7 +32,7 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2-sources.jar Binary files differdeleted file mode 100644 index a7049595..00000000 --- a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar Binary files differdeleted file mode 100644 index a9a98db5..00000000 --- a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..161f75ce --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar Binary files differnew file mode 100644 index 00000000..1aba21b9 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.pom index edd2e165..db292d24 100644 --- a/common/androidx-media3/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-exoplayer</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 ExoPlayer module</name> <description>Media3 ExoPlayer module</description> @@ -32,35 +32,42 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> + <scope>compile</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-datasource</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-decoder</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-extractor</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-database</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> @@ -73,7 +80,7 @@ <dependency> <groupId>androidx.core</groupId> <artifactId>core</artifactId> - <version>1.7.0</version> + <version>1.8.0</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar Binary files differdeleted file mode 100644 index a81c11b0..00000000 --- a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1-sources.jar Binary files differindex d9b1184e..69bd8641 100644 --- a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2-sources.jar +++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar Binary files differnew file mode 100644 index 00000000..8e428acd --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.pom index c6931342..d1cc5abb 100644 --- a/common/androidx-media3/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-extractor</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 Extractor module</name> <description>Media3 Extractor module</description> @@ -38,14 +38,21 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-decoder</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..b7fab239 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar Binary files differnew file mode 100644 index 00000000..63b5f77b --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom new file mode 100644 index 00000000..846735e6 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-muxer/1.1.1/media3-muxer-1.1.1.pom @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>androidx.media3</groupId> + <artifactId>media3-muxer</artifactId> + <version>1.1.1</version> + <packaging>aar</packaging> + <name>Media3 Muxer module</name> + <description>Media3 Muxer module</description> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <name>The Android Open Source Project</name> + </developer> + </developers> + <scm> + <connection>scm:git:https://github.com/androidx/media.git</connection> + <url>https://github.com/androidx/media</url> + </scm> + <dependencies> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-common</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.3.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2-sources.jar Binary files differdeleted file mode 100644 index a021d483..00000000 --- a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2.aar Binary files differdeleted file mode 100644 index 581324e8..00000000 --- a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..ff559738 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar Binary files differnew file mode 100644 index 00000000..e2adb991 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.pom index d5aae083..4662732c 100644 --- a/common/androidx-media3/androidx/media3/media3-session/1.0.2/media3-session-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-session/1.1.1/media3-session-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-session</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 Session module</name> <description>Media3 Session module</description> @@ -32,14 +32,14 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>compile</scope> <type>aar</type> </dependency> <dependency> <groupId>androidx.collection</groupId> <artifactId>collection</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar Binary files differdeleted file mode 100644 index 22012ddc..00000000 --- a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar Binary files differdeleted file mode 100644 index ffe80f6a..00000000 --- a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom deleted file mode 100644 index fe7743b4..00000000 --- a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!-- This module was also published with a richer model, Gradle metadata, --> - <!-- which should be used instead. Do not delete the following line which --> - <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> - <!-- that they should prefer consuming it instead. --> - <!-- do_not_remove: published-with-gradle-metadata --> - <modelVersion>4.0.0</modelVersion> - <groupId>androidx.media3</groupId> - <artifactId>media3-test-utils</artifactId> - <version>1.0.2</version> - <packaging>aar</packaging> - <name>Media3 test utils module</name> - <description>Media3 test utils module</description> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <developers> - <developer> - <name>The Android Open Source Project</name> - </developer> - </developers> - <scm> - <connection>scm:git:https://github.com/androidx/media.git</connection> - <url>https://github.com/androidx/media</url> - </scm> - <dependencies> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>3.12.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.test</groupId> - <artifactId>core</artifactId> - <version>1.4.0</version> - <scope>compile</scope> - <type>aar</type> - </dependency> - <dependency> - <groupId>androidx.test.ext</groupId> - <artifactId>junit</artifactId> - <version>1.1.3</version> - <scope>compile</scope> - <type>aar</type> - </dependency> - <dependency> - <groupId>androidx.test.ext</groupId> - <artifactId>truth</artifactId> - <version>1.4.0</version> - <scope>compile</scope> - <type>aar</type> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.truth</groupId> - <artifactId>truth</artifactId> - <version>1.1.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.truth.extensions</groupId> - <artifactId>truth-java8-extension</artifactId> - <version>1.1.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>androidx.annotation</groupId> - <artifactId>annotation</artifactId> - <version>1.3.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>mockwebserver</artifactId> - <version>4.9.2</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>androidx.media3</groupId> - <artifactId>media3-exoplayer</artifactId> - <version>1.0.2</version> - <scope>runtime</scope> - <type>aar</type> - </dependency> - </dependencies> -</project> diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2-sources.jar Binary files differdeleted file mode 100644 index b7a7f093..00000000 --- a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.aar Binary files differdeleted file mode 100644 index 6f51e3bb..00000000 --- a/common/androidx-media3/androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.aar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..51a6d512 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar Binary files differnew file mode 100644 index 00000000..87066fb7 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom new file mode 100644 index 00000000..76295749 --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-transformer/1.1.1/media3-transformer-1.1.1.pom @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>androidx.media3</groupId> + <artifactId>media3-transformer</artifactId> + <version>1.1.1</version> + <packaging>aar</packaging> + <name>Media3 Transformer module</name> + <description>Media3 Transformer module</description> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <name>The Android Open Source Project</name> + </developer> + </developers> + <scm> + <connection>scm:git:https://github.com/androidx/media.git</connection> + <url>https://github.com/androidx/media</url> + </scm> + <dependencies> + <dependency> + <groupId>androidx.annotation</groupId> + <artifactId>annotation</artifactId> + <version>1.3.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-datasource</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-container</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-exoplayer</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-effect</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-muxer</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <type>aar</type> + </dependency> + </dependencies> +</project> diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2-sources.jar Binary files differdeleted file mode 100644 index ddbc58ad..00000000 --- a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2-sources.jar +++ /dev/null diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar Binary files differnew file mode 100644 index 00000000..4504cbbb --- /dev/null +++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1-sources.jar diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar Binary files differindex ca30387b..968c9868 100644 --- a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar +++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar diff --git a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.pom index 118923c4..fde45f98 100644 --- a/common/androidx-media3/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.pom +++ b/common/androidx-media3/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.pom @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>androidx.media3</groupId> <artifactId>media3-ui</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <packaging>aar</packaging> <name>Media3 UI module</name> <description>Media3 UI module</description> @@ -32,7 +32,7 @@ <dependency> <groupId>androidx.media3</groupId> <artifactId>media3-common</artifactId> - <version>1.0.2</version> + <version>1.1.1</version> <scope>runtime</scope> <type>aar</type> </dependency> @@ -52,7 +52,7 @@ <dependency> <groupId>androidx.recyclerview</groupId> <artifactId>recyclerview</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> <scope>runtime</scope> <type>aar</type> </dependency> diff --git a/common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-container/AndroidManifest.xml index cc497f3d..5f4f689f 100644 --- a/common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml +++ b/common/androidx-media3/manifests/androidx.media3.media3-container/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2016 The Android Open Source Project + Copyright 2023 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. @@ -15,7 +15,7 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="androidx.media3.test.utils" > + package="androidx.media3.container" > <uses-sdk android:minSdkVersion="16" diff --git a/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml new file mode 100644 index 00000000..bea24c29 --- /dev/null +++ b/common/androidx-media3/manifests/androidx.media3.media3-muxer/AndroidManifest.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2022 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 + + http://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" + package="androidx.media3.muxer" > + + <uses-sdk + android:minSdkVersion="16" + android:targetSdkVersion="30" /> + +</manifest>
\ No newline at end of file diff --git a/common/androidx-media3/update-from-gmaven.py b/common/androidx-media3/update-from-gmaven.py index 88aef4bd..5c6b3799 100755 --- a/common/androidx-media3/update-from-gmaven.py +++ b/common/androidx-media3/update-from-gmaven.py @@ -23,13 +23,13 @@ # Manual verification steps: # 1. Build the 'leaf' imported modules (i.e. the set that ends up depending # on *everything* transitively), e.g. -# $ m androidx.media3.media3-exoplayer-dash androidx.media3.media3-exoplayer androidx.media3.media3-session androidx.media3.media3-test-utils androidx.media3.media3-transformer androidx.media3.media3-ui +# $ m androidx.media3.media3-exoplayer-dash androidx.media3.media3-exoplayer androidx.media3.media3-session androidx.media3.media3-transformer androidx.media3.media3-ui import os import subprocess import sys -media3Version="1.0.2" +media3Version="1.1.1" mavenToBpPatternMap = { "androidx.media3:" : "androidx.media3.", @@ -103,6 +103,7 @@ cmd("rm -rf androidx/media3") cmd("rm -rf manifests") downloadArtifact("androidx.media3", "media3-common", media3Version) +downloadArtifact("androidx.media3", "media3-container", media3Version) downloadArtifact("androidx.media3", "media3-database", media3Version) downloadArtifact("androidx.media3", "media3-datasource", media3Version) downloadArtifact("androidx.media3", "media3-decoder", media3Version) @@ -110,8 +111,8 @@ downloadArtifact("androidx.media3", "media3-effect", media3Version) downloadArtifact("androidx.media3", "media3-exoplayer", media3Version) downloadArtifact("androidx.media3", "media3-exoplayer-dash", media3Version) downloadArtifact("androidx.media3", "media3-extractor", media3Version) +downloadArtifact("androidx.media3", "media3-muxer", media3Version) downloadArtifact("androidx.media3", "media3-session", media3Version) -downloadArtifact("androidx.media3", "media3-test-utils", media3Version) downloadArtifact("androidx.media3", "media3-transformer", media3Version) downloadArtifact("androidx.media3", "media3-ui", media3Version) |