summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2017-12-06 11:52:02 -0800
committerXin Li <delphij@google.com>2017-12-06 14:24:50 -0800
commit6f110bb98d6e100f1b60022f0db64ac144a3c0ae (patch)
treec23d8b1106cb1b9202425ffd008bae2ee13b33da
parentca11166173d7509b64ca051d73705c38fa763bd9 (diff)
parent231865f6ee85c41c11f5613163b870e6f438b364 (diff)
downloadmultidex-6f110bb98d6e100f1b60022f0db64ac144a3c0ae.tar.gz
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: Ic5e756290cd6e1c096984cce2e0b75feb82b3b67
-rw-r--r--.gitignore1
-rw-r--r--build.gradle11
2 files changed, 2 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..639cdd5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+local.properties
diff --git a/build.gradle b/build.gradle
index 10fac34..b9af213 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,16 +89,7 @@ subprojects {
version = rootProject.multidexVersion
group = 'com.android.support'
- task release(type: Upload) {
- configuration = configurations.archives
- repositories {
- mavenDeployer {
- repository(url: uri("$rootProject.supportRepoOut"))
- }
- }
- }
-
- dist.dependsOn release
+ dist.dependsOn project.tasks.uploadArchives
project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {