Update ConstraintLayout to 2.2.0-alpha05
Taken from build 9239797 manually, as 'update_prebuilds.py -c <buildId>' seems broken.
```
/google/data/ro/projects/android/fetch_artifact --bid 9239797 --target androidx top-of-tree-m2repository-all-9239797.zip ./
unzip top-of-tree-m2repository-all-9239797.zip
# moved files manually in the correct folder
```
Androidx deps will soon be moved out from /extra. This cl is a temporary update before the migration out of /extra effort takes place.
Bug: 259261262
Bug: 259092992
Bug: 245268301
Bug: 243647188
Test: flashed device, played with it, nothing seems broken
Change-Id: I8c2fe29ff2cf34c5185fbfd3a5181b6bb49795af
diff --git a/current/extras/constraint-layout-x/Android.bp b/current/extras/constraint-layout-x/Android.bp
index f37cd93..1c5f6b4 100644
--- a/current/extras/constraint-layout-x/Android.bp
+++ b/current/extras/constraint-layout-x/Android.bp
@@ -34,9 +34,34 @@
java_version: "1.7",
}
+java_import {
+ name: "androidx-constraintlayout_constraintlayout-core-nodeps",
+ jars: ["constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar"],
+ sdk_version: "current",
+ min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+}
+
+java_library_static {
+ name: "androidx-constraintlayout_constraintlayout-core",
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "24",
+ static_libs: [
+ "androidx-constraintlayout_constraintlayout-core-nodeps",
+ ],
+ java_version: "1.7",
+}
+
android_library_import {
name: "androidx-constraintlayout_constraintlayout-nodeps",
- aars: ["constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar"],
+ aars: ["constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -46,7 +71,7 @@
static_libs: [
"androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx-constraintlayout_constraintlayout-solver",
+ "androidx-constraintlayout_constraintlayout-core",
],
}
@@ -63,7 +88,7 @@
"androidx-constraintlayout_constraintlayout-nodeps",
"androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx-constraintlayout_constraintlayout-solver",
+ "androidx-constraintlayout_constraintlayout-core",
],
java_version: "1.7",
}
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar
new file mode 100644
index 0000000..258487c
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar
Binary files differ
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.md5 b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.md5
new file mode 100644
index 0000000..7abef43
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.md5
@@ -0,0 +1 @@
+da78b7df2f96e742005c09d1c6dcaa11
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.sha1 b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.sha1
new file mode 100644
index 0000000..14f28c0
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.sha1
@@ -0,0 +1 @@
+258fa53b826c58e181a6f3e2dfd650b13bfd5f6d
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom
new file mode 100644
index 0000000..5b990f1
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!-- 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.constraintlayout</groupId>
+ <artifactId>constraintlayout-core</artifactId>
+ <version>1.1.0-alpha05</version>
+ <name>Android ConstraintLayout Core Library</name>
+ <description>This library contains engines and algorithms for constraint based layout and complex animations (it is used by the ConstraintLayout library)</description>
+ <url>https://developer.android.com/jetpack/androidx/releases/constraintlayout#1.1.0-alpha05</url>
+ <inceptionYear>2022</inceptionYear>
+ <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://android.googlesource.com/platform/frameworks/support</connection>
+ <url>https://cs.android.com/androidx/platform/frameworks/support</url>
+ </scm>
+</project>
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.md5 b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.md5
new file mode 100644
index 0000000..19357cb
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.md5
@@ -0,0 +1 @@
+60562c5add8ad85dab415c711f69d9c3
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.sha1
new file mode 100644
index 0000000..a529601
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.sha1
@@ -0,0 +1 @@
+8dd11aa2470783f415f04554f22e298a1871a70d
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar
deleted file mode 100644
index 3956134..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar
+++ /dev/null
Binary files differ
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5
deleted file mode 100644
index 243bcca..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-841352198d38208068ef37cc6501dece
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1
deleted file mode 100644
index e05d779..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b2311a13ef07a384a22607588c535d111a8ae74
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom
deleted file mode 100644
index c273a18..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>androidx.constraintlayout</groupId>
- <artifactId>constraintlayout</artifactId>
- <version>2.0.0-beta7</version>
- <packaging>aar</packaging>
- <name>Android ConstraintLayout</name>
- <description>ConstraintLayout for Android</description>
- <url>http://tools.android.com</url>
- <inceptionYear>2007</inceptionYear>
- <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>git://android.googlesource.com/platform/tools/sherpa.git</connection>
- <url>https://android.googlesource.com/platform/tools/sherpa</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>androidx.appcompat</groupId>
- <artifactId>appcompat</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.core</groupId>
- <artifactId>core</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>androidx.constraintlayout</groupId>
- <artifactId>constraintlayout-solver</artifactId>
- <version>2.0.0-beta7</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5
deleted file mode 100644
index 3d1503d..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-e77f92cab139a5e26f3c4d9716c85409
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1
deleted file mode 100644
index e5dbed7..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7257715c588c812a7c7e174335467bde73620c3a
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar
new file mode 100644
index 0000000..6a6a7e2
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar
Binary files differ
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.md5 b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.md5
new file mode 100644
index 0000000..2c5685a
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.md5
@@ -0,0 +1 @@
+7e11b567daa9e3a2c44da0dd8d7374d8
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.sha1
new file mode 100644
index 0000000..19455c0
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.sha1
@@ -0,0 +1 @@
+ae6cc37aaf642dcf3fe95f6d4f5e1adac71d97ef
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom
new file mode 100644
index 0000000..4601e62
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!-- 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.constraintlayout</groupId>
+ <artifactId>constraintlayout</artifactId>
+ <version>2.2.0-alpha05</version>
+ <packaging>aar</packaging>
+ <name>Android ConstraintLayout Library</name>
+ <description>This library offers a flexible and adaptable way to position and animate widgets</description>
+ <url>https://developer.android.com/jetpack/androidx/releases/constraintlayout#2.2.0-alpha05</url>
+ <inceptionYear>2022</inceptionYear>
+ <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://android.googlesource.com/platform/frameworks/support</connection>
+ <url>https://cs.android.com/androidx/platform/frameworks/support</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>androidx.appcompat</groupId>
+ <artifactId>appcompat</artifactId>
+ <version>1.2.0</version>
+ <scope>runtime</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>androidx.constraintlayout</groupId>
+ <artifactId>constraintlayout-core</artifactId>
+ <version>1.1.0-alpha05</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.core</groupId>
+ <artifactId>core</artifactId>
+ <version>1.3.2</version>
+ <scope>runtime</scope>
+ <type>aar</type>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.md5 b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.md5
new file mode 100644
index 0000000..7b6fad5
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.md5
@@ -0,0 +1 @@
+d228e5e697dd74caee4b879c4f6fc932
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.sha1
new file mode 100644
index 0000000..8b83f0b
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.sha1
@@ -0,0 +1 @@
+ffc535449f4c799f46e76776b7ade80919643f16
\ No newline at end of file