Revert "Update ConstraintLayout to 2.2.0-alpha05"
Revert submission 20509006-constraintLayout-update
Reason for revert: b/259715781
Reverted Changes:
I8c2fe29ff:Update ConstraintLayout to 2.2.0-alpha05
Iab2a8f459:Update constraint layout version
Change-Id: I031da40b25871c83fb1ad77f47128368163a629b
diff --git a/current/extras/constraint-layout-x/Android.bp b/current/extras/constraint-layout-x/Android.bp
index 1c5f6b4..f37cd93 100644
--- a/current/extras/constraint-layout-x/Android.bp
+++ b/current/extras/constraint-layout-x/Android.bp
@@ -34,34 +34,9 @@
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.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar"],
+ aars: ["constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar"],
sdk_version: "current",
apex_available: [
"//apex_available:platform",
@@ -71,7 +46,7 @@
static_libs: [
"androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx-constraintlayout_constraintlayout-core",
+ "androidx-constraintlayout_constraintlayout-solver",
],
}
@@ -88,7 +63,7 @@
"androidx-constraintlayout_constraintlayout-nodeps",
"androidx.appcompat_appcompat",
"androidx.core_core",
- "androidx-constraintlayout_constraintlayout-core",
+ "androidx-constraintlayout_constraintlayout-solver",
],
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
deleted file mode 100644
index 258487c..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar
+++ /dev/null
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
deleted file mode 100644
index 7abef43..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 14f28c0..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 5b990f1..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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
deleted file mode 100644
index 19357cb..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a529601..0000000
--- a/current/extras/constraint-layout-x/constraintlayout-core/1.1.0-alpha05/constraintlayout-core-1.1.0-alpha05.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-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
new file mode 100644
index 0000000..3956134
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar
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
new file mode 100644
index 0000000..243bcca
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e05d779
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..c273a18
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom
@@ -0,0 +1,49 @@
+<?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
new file mode 100644
index 0000000..3d1503d
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e5dbed7
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1
@@ -0,0 +1 @@
+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
deleted file mode 100644
index 6a6a7e2..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar
+++ /dev/null
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
deleted file mode 100644
index 2c5685a..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 19455c0..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4601e62..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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
deleted file mode 100644
index 7b6fad5..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8b83f0b..0000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.2.0-alpha05/constraintlayout-2.2.0-alpha05.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ffc535449f4c799f46e76776b7ade80919643f16
\ No newline at end of file