Fix the names of support library projects to match released names
Our internal names of projects did not match external project names:
eg. we used support-appcompat-v7 vs appcompat-v7. Renaming these to
correct names will fix top-of-tree-repo zip.
Bug: 63899246
Test: manually inspected ./gradlew buildOnServer
Change-Id: Ic44b115431060e465fa4d1d2076bb5f4843457f9
diff --git a/design/build.gradle b/design/build.gradle
index b5a13ee..6822563 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -2,9 +2,9 @@
dependencies {
api project(':support-v4')
- api project(':support-appcompat-v7')
- api project(':support-recyclerview-v7')
- api project(':support-transition')
+ api project(':appcompat-v7')
+ api project(':recyclerview-v7')
+ api project(':transition')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle
index 2e37619..05bff7f 100644
--- a/emoji/appcompat/build.gradle
+++ b/emoji/appcompat/build.gradle
@@ -19,7 +19,7 @@
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
api project(':support-emoji')
- api project(':support-appcompat-v7')
+ api project(':appcompat-v7')
}
android {
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 49b38ec..2e3ac33 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-appcompat-v7')
- implementation project(':support-cardview-v7')
- implementation project(':support-gridlayout-v7')
- implementation project(':support-mediarouter-v7')
- implementation project(':support-palette-v7')
- implementation project(':support-recyclerview-v7')
+ implementation project(':appcompat-v7')
+ implementation project(':cardview-v7')
+ implementation project(':gridlayout-v7')
+ implementation project(':mediarouter-v7')
+ implementation project(':palette-v7')
+ implementation project(':recyclerview-v7')
}
android {
diff --git a/samples/SupportDesignDemos/build.gradle b/samples/SupportDesignDemos/build.gradle
index 48dfc9c..9dbf54b 100644
--- a/samples/SupportDesignDemos/build.gradle
+++ b/samples/SupportDesignDemos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-design')
+ implementation project(':design')
}
android {
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index 4ec403e..014cd16 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-leanback-v17')
- implementation project(':support-preference-leanback-v17')
+ implementation project(':leanback-v17')
+ implementation project(':preference-leanback-v17')
}
android {
diff --git a/samples/SupportLeanbackJank/build.gradle b/samples/SupportLeanbackJank/build.gradle
index 4900a65..6db5dcf 100644
--- a/samples/SupportLeanbackJank/build.gradle
+++ b/samples/SupportLeanbackJank/build.gradle
@@ -2,8 +2,8 @@
dependencies {
implementation 'com.github.bumptech.glide:glide:3.6.1'
- implementation project(':support-leanback-v17')
- implementation project(':support-preference-leanback-v17')
+ implementation project(':leanback-v17')
+ implementation project(':preference-leanback-v17')
}
android {
diff --git a/samples/SupportPercentDemos/build.gradle b/samples/SupportPercentDemos/build.gradle
index 863da83..f52f293 100644
--- a/samples/SupportPercentDemos/build.gradle
+++ b/samples/SupportPercentDemos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-percent')
+ implementation project(':percent')
}
android {
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index d09e3db..0ed8424 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-appcompat-v7')
- implementation project(':support-recyclerview-v7')
- implementation project(':support-preference-v7')
- implementation project(':support-preference-v14')
- implementation project(':support-leanback-v17')
- implementation project(':support-preference-leanback-v17')
+ implementation project(':appcompat-v7')
+ implementation project(':recyclerview-v7')
+ implementation project(':preference-v7')
+ implementation project(':preference-v14')
+ implementation project(':leanback-v17')
+ implementation project(':preference-leanback-v17')
}
android {
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index 2a4fffc..720e2a2 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-transition')
- implementation project(':support-appcompat-v7')
+ implementation project(':transition')
+ implementation project(':appcompat-v7')
}
android {
diff --git a/samples/SupportVectorDrawableDemos/build.gradle b/samples/SupportVectorDrawableDemos/build.gradle
index 79383ca..a3a4db6 100644
--- a/samples/SupportVectorDrawableDemos/build.gradle
+++ b/samples/SupportVectorDrawableDemos/build.gradle
@@ -18,8 +18,8 @@
dependencies {
implementation project(':support-vector-drawable')
- implementation project(':support-animated-vector-drawable')
- implementation project(':support-appcompat-v7')
+ implementation project(':animated-vector-drawable')
+ implementation project(':appcompat-v7')
}
android {
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index 4a22995..d9d7e29 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-wear')
+ implementation project(':wear')
}
android {
diff --git a/settings.gradle b/settings.gradle
index 242eda6..2e92895 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,71 +25,71 @@
include ':support-v4'
project(':support-v4').projectDir = new File(rootDir, 'v4')
-include ':support-appcompat-v7'
-project(':support-appcompat-v7').projectDir = new File(rootDir, 'v7/appcompat')
+include ':appcompat-v7'
+project(':appcompat-v7').projectDir = new File(rootDir, 'v7/appcompat')
-include ':support-gridlayout-v7'
-project(':support-gridlayout-v7').projectDir = new File(rootDir, 'v7/gridlayout')
+include ':gridlayout-v7'
+project(':gridlayout-v7').projectDir = new File(rootDir, 'v7/gridlayout')
-include ':support-mediarouter-v7'
-project(':support-mediarouter-v7').projectDir = new File(rootDir, 'v7/mediarouter')
+include ':mediarouter-v7'
+project(':mediarouter-v7').projectDir = new File(rootDir, 'v7/mediarouter')
-include ':support-palette-v7'
-project(':support-palette-v7').projectDir = new File(rootDir, 'v7/palette')
+include ':palette-v7'
+project(':palette-v7').projectDir = new File(rootDir, 'v7/palette')
-include ':support-recyclerview-v7'
-project(':support-recyclerview-v7').projectDir = new File(rootDir, 'v7/recyclerview')
+include ':recyclerview-v7'
+project(':recyclerview-v7').projectDir = new File(rootDir, 'v7/recyclerview')
-include ':support-cardview-v7'
-project(':support-cardview-v7').projectDir = new File(rootDir, 'v7/cardview')
+include ':cardview-v7'
+project(':cardview-v7').projectDir = new File(rootDir, 'v7/cardview')
-include ':support-preference-v7'
-project(':support-preference-v7').projectDir = new File(rootDir, 'v7/preference')
+include ':preference-v7'
+project(':preference-v7').projectDir = new File(rootDir, 'v7/preference')
-include ':support-preference-v14'
-project(':support-preference-v14').projectDir = new File(rootDir, 'v14/preference')
+include ':preference-v14'
+project(':preference-v14').projectDir = new File(rootDir, 'v14/preference')
-include ':support-preference-leanback-v17'
-project(':support-preference-leanback-v17').projectDir = new File(rootDir, 'v17/preference-leanback')
+include ':preference-leanback-v17'
+project(':preference-leanback-v17').projectDir = new File(rootDir, 'v17/preference-leanback')
include ':support-v13'
project(':support-v13').projectDir = new File(rootDir, 'v13')
-include ':support-leanback-v17'
-project(':support-leanback-v17').projectDir = new File(rootDir, 'v17/leanback')
+include ':leanback-v17'
+project(':leanback-v17').projectDir = new File(rootDir, 'v17/leanback')
include ':support-recommendation'
project(':support-recommendation').projectDir = new File(rootDir, 'recommendation')
-include ':support-design'
-project(':support-design').projectDir = new File(rootDir, 'design')
+include ':design'
+project(':design').projectDir = new File(rootDir, 'design')
-include ':support-percent'
-project(':support-percent').projectDir = new File(rootDir, 'percent')
+include ':percent'
+project(':percent').projectDir = new File(rootDir, 'percent')
-include ':support-customtabs'
-project(':support-customtabs').projectDir = new File(rootDir, 'customtabs')
+include ':customtabs'
+project(':customtabs').projectDir = new File(rootDir, 'customtabs')
-include ':support-recommendation'
-project(':support-recommendation').projectDir = new File(rootDir, 'recommendation')
+include ':recommendation'
+project(':recommendation').projectDir = new File(rootDir, 'recommendation')
include ':support-vector-drawable'
project(':support-vector-drawable').projectDir = new File(rootDir, 'graphics/drawable/static')
-include ':support-animated-vector-drawable'
-project(':support-animated-vector-drawable').projectDir = new File(rootDir, 'graphics/drawable/animated')
+include ':animated-vector-drawable'
+project(':animated-vector-drawable').projectDir = new File(rootDir, 'graphics/drawable/animated')
-include ':support-transition'
-project(':support-transition').projectDir = new File(rootDir, 'transition')
+include ':transition'
+project(':transition').projectDir = new File(rootDir, 'transition')
include ':support-dynamic-animation'
project(':support-dynamic-animation').projectDir = new File(rootDir, 'dynamic-animation')
-include ':support-exifinterface'
-project(':support-exifinterface').projectDir = new File(rootDir, 'exifinterface')
+include ':exifinterface'
+project(':exifinterface').projectDir = new File(rootDir, 'exifinterface')
-include ':support-wear'
-project(':support-wear').projectDir = new File(rootDir, 'wear')
+include ':wear'
+project(':wear').projectDir = new File(rootDir, 'wear')
include ':support-tv-provider'
project(':support-tv-provider').projectDir = new File(rootDir, 'tv-provider')
diff --git a/v14/preference/build.gradle b/v14/preference/build.gradle
index bdb8c05..24f1688 100644
--- a/v14/preference/build.gradle
+++ b/v14/preference/build.gradle
@@ -18,9 +18,9 @@
dependencies {
api project(':support-v4')
- api project(':support-appcompat-v7')
- api project(':support-recyclerview-v7')
- api project(':support-preference-v7')
+ api project(':appcompat-v7')
+ api project(':recyclerview-v7')
+ api project(':preference-v7')
}
android {
diff --git a/v17/leanback/build.gradle b/v17/leanback/build.gradle
index f597724..06ab334 100644
--- a/v17/leanback/build.gradle
+++ b/v17/leanback/build.gradle
@@ -5,7 +5,7 @@
api project(':support-core-ui')
api project(':support-media-compat')
api project(':support-fragment')
- api project(':support-recyclerview-v7')
+ api project(':recyclerview-v7')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
diff --git a/v17/preference-leanback/build.gradle b/v17/preference-leanback/build.gradle
index 4222f5b..8873587 100644
--- a/v17/preference-leanback/build.gradle
+++ b/v17/preference-leanback/build.gradle
@@ -2,11 +2,11 @@
dependencies {
api project(':support-v4')
- api project(':support-appcompat-v7')
- api project(':support-recyclerview-v7')
- api project(':support-preference-v7')
- api project(':support-preference-v14')
- api project(':support-leanback-v17')
+ api project(':appcompat-v7')
+ api project(':recyclerview-v7')
+ api project(':preference-v7')
+ api project(':preference-v14')
+ api project(':leanback-v17')
}
android {
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index 073b923..102c779 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -4,7 +4,7 @@
api project(':support-annotations')
api project(':support-v4')
api project(':support-vector-drawable')
- api project(':support-animated-vector-drawable')
+ api project(':animated-vector-drawable')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index 90900ac..54c720b 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -1,8 +1,8 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
- api project(":support-appcompat-v7")
- api project(":support-palette-v7")
+ api project(":appcompat-v7")
+ api project(":palette-v7")
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
diff --git a/v7/preference/build.gradle b/v7/preference/build.gradle
index df8a477..65e78f0 100644
--- a/v7/preference/build.gradle
+++ b/v7/preference/build.gradle
@@ -18,8 +18,8 @@
dependencies {
api project(':support-v4')
- api project(':support-appcompat-v7')
- api project(':support-recyclerview-v7')
+ api project(':appcompat-v7')
+ api project(':recyclerview-v7')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
diff --git a/wear/build.gradle b/wear/build.gradle
index 4317cfc..4507e2c 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -3,8 +3,8 @@
dependencies {
api project(':support-annotations')
api project(':support-core-ui')
- api project(':support-percent')
- api project(':support-recyclerview-v7')
+ api project(':percent')
+ api project(':recyclerview-v7')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'