Properly quarantine unreleased camera libraries
These is not yet ready for release, so will be quarantined
separately using `overrideIncludes` rather than just setting
the `mavenVersion` in the build.gradle.
Bug: 315042461
Test: ./gradlew \
:camera:<released-library>:generateMetadataFileForMavenPublication \
# does not include any of these libraries as constraints
Change-Id: I1d0cbd4a22571185e156d59c094fb59c53860bd7
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index d8038be..30f020c 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -104,7 +104,6 @@
androidx {
name = "Camera2 Pipe Integration"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.CAMERA_PIPE
inceptionYear = "2020"
description = "A Camera2 Pipe implementation of CameraX, a library providing a consistent " +
"and reliable camera foundation that enables great camera driven experiences across " +
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index d9a7bf3..0356fda 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -71,7 +71,6 @@
androidx {
name = "Camera2 Pipe"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.CAMERA_PIPE
inceptionYear = "2020"
description = "A set of opinionated camera interfaces and implementations on top of Camera2 " +
"that will form a flexible shim layer to power Frameserver and CameraX."
diff --git a/camera/camera-viewfinder-compose/build.gradle b/camera/camera-viewfinder-compose/build.gradle
index 9ee147a..d2e5af0 100644
--- a/camera/camera-viewfinder-compose/build.gradle
+++ b/camera/camera-viewfinder-compose/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import androidx.build.LibraryType
import androidx.build.Publish
plugins {
@@ -35,7 +34,6 @@
androidx {
name = "androidx.camera:camera-viewfinder-compose"
- type = LibraryType.PUBLISHED_LIBRARY
publish = Publish.SNAPSHOT_AND_RELEASE
inceptionYear = "2023"
description = "Composable ViewFinder implementation for CameraX"
diff --git a/libraryversions.toml b/libraryversions.toml
index 7794b18..1f8116f 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -20,6 +20,7 @@
CAMERA_PIPE = "1.0.0-alpha01"
CAMERA_TESTING = "1.0.0-alpha01"
CAMERA_VIEWFINDER = "1.4.0-alpha03"
+CAMERA_VIEWFINDER_COMPOSE = "1.0.0-alpha01"
CARDVIEW = "1.1.0-alpha01"
CAR_APP = "1.7.0-alpha01"
COLLECTION = "1.4.0-beta02"
@@ -191,8 +192,10 @@
CAMERA = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA" }
CAMERA_EFFECTS = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_EFFECTS", overrideInclude = [ ":camera:camera-effects" ] }
CAMERA_MLKIT_VISION = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_MLKIT_VISION", overrideInclude = [ ":camera:camera-mlkit-vision" ] }
+CAMERA_PIPE = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_PIPE", overrideInclude = [ ":camera:camera-camera2-pipe", ":camera:camera-camera2-pipe-integration" ] }
CAMERA_TESTING = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_TESTING", overrideInclude = [ ":camera:camera-testing" ] }
-CAMERA_VIEWFINDER = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_VIEWFINDER", overrideInclude = [ ":camera:camera-viewfinder", ":camera:camera-viewfinder-compose", ":camera:camera-viewfinder-core" ] }
+CAMERA_VIEWFINDER = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_VIEWFINDER", overrideInclude = [ ":camera:camera-viewfinder", ":camera:camera-viewfinder-core" ] }
+CAMERA_VIEWFINDER_COMPOSE = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_VIEWFINDER_COMPOSE", overrideInclude = [ ":camera:camera-viewfinder-compose" ] }
CARDVIEW = { group = "androidx.cardview", atomicGroupVersion = "versions.CARDVIEW" }
CAR_APP = { group = "androidx.car.app", atomicGroupVersion = "versions.CAR_APP" }
COLLECTION = { group = "androidx.collection", atomicGroupVersion = "versions.COLLECTION" }