[android-platform-tools-base] 06/30: Refreshed patches along with the following changes:
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Fri Jul 22 10:33:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.
commit 946493f524db48f76280d25b92bf9123f69b079d
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Tue Jul 19 22:11:33 2016 +0800
Refreshed patches along with the following changes:
* No longer hard-code versions
* Removed some patches modifying non-existing files
---
debian/patches/SdkTestCase.patch | 8 +-
debian/patches/build.gradle.patch | 760 +++++------------------
debian/patches/gradle-experimental.patch | 64 +-
debian/patches/libhttpcore-java-ThreadSafe.patch | 10 +-
debian/patches/project-test-lib.patch | 21 +-
debian/patches/series | 1 -
debian/patches/settings.gradle.patch | 63 --
debian/patches/trove3.patch | 82 +--
8 files changed, 203 insertions(+), 806 deletions(-)
diff --git a/debian/patches/SdkTestCase.patch b/debian/patches/SdkTestCase.patch
index 5666a3d..b707978 100644
--- a/debian/patches/SdkTestCase.patch
+++ b/debian/patches/SdkTestCase.patch
@@ -6,11 +6,9 @@ Subject: SdkTestCase
.../testutils/src/main/java/com/android/testutils/SdkTestCase.java | 7 -------
1 file changed, 7 deletions(-)
-diff --git a/base/testutils/src/main/java/com/android/testutils/SdkTestCase.java b/base/testutils/src/main/java/com/android/testutils/SdkTestCase.java
-index 75877a5..2a3eded 100644
---- a/base/testutils/src/main/java/com/android/testutils/SdkTestCase.java
-+++ b/base/testutils/src/main/java/com/android/testutils/SdkTestCase.java
-@@ -353,13 +353,6 @@ public abstract class SdkTestCase extends TestCase {
+--- a/testutils/src/main/java/com/android/testutils/SdkTestCase.java
++++ b/testutils/src/main/java/com/android/testutils/SdkTestCase.java
+@@ -354,13 +354,6 @@
tempFile.delete();
}
diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index 9c04493..4c0a7a6 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -1,80 +1,30 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 21 Jan 2016 20:52:18 +0100
-Subject: build.gradle
-
-Patch upstream's build system for Debian.
-
+Author: Markus Koschany <apo at debian.org>
+ Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2016-07-19
+Description: Patch upstream's build system for Debian.
Forwarded: not-needed
----
- base/annotations/build.gradle | 7 ++---
- base/asset-studio/build.gradle | 5 ++--
- base/build-system/builder-model/build.gradle | 13 +++-------
- base/build-system/builder-test-api/build.gradle | 8 +-----
- base/build-system/builder/build.gradle | 19 +++-----------
- base/build-system/google-services/build.gradle | 7 +----
- base/build-system/gradle-core/build.gradle | 7 ++---
- base/build-system/gradle-experimental/build.gradle | 7 +----
- base/build-system/gradle/build.gradle | 9 +------
- base/build-system/integration-test/build.gradle | 5 ++--
- .../3rdPartyTests/buildSrc/build.gradle | 3 +--
- base/build-system/manifest-merger/build.gradle | 7 ++---
- base/build-system/project-test-lib/build.gradle | 2 --
- base/build-system/project-test/build.gradle | 2 --
- base/build.gradle | 1 -
- base/chartlib/build.gradle | 3 +--
- base/common/build.gradle | 7 ++---
- base/ddmlib/build.gradle | 7 ++---
- base/device_validator/dvlib/build.gradle | 8 ++----
- base/draw9patch/build.gradle | 17 ++----------
- base/jack/jack-api/build.gradle | 3 ---
- base/jack/jill-api/build.gradle | 3 ---
- base/jobb/build.gradle | 16 ++----------
- base/layoutlib-api/build.gradle | 7 ++---
- base/legacy/ant-tasks/build.gradle | 4 +--
- base/legacy/archquery/build.gradle | 5 ++--
- base/lint/cli/build.gradle | 20 +++------------
- base/lint/libs/lint-api/build.gradle | 7 ++---
- base/lint/libs/lint-checks/build.gradle | 7 ++---
- base/lint/libs/lint-tests/build.gradle | 5 +---
- base/misc/screenshot2/build.gradle | 15 ++---------
- base/ninepatch/build.gradle | 4 +--
- base/perflib/build.gradle | 3 +--
- base/rpclib/build.gradle | 3 +--
- base/rule-api/build.gradle | 4 +--
- base/sdk-common/build.gradle | 7 ++---
- base/sdk-common/generate-locale-data/build.gradle | 5 ++--
- base/sdklib/build.gradle | 7 ++---
- base/sdklib/test.gradle | 2 +-
- base/templates/build.gradle | 10 --------
- base/testutils/build.gradle | 5 +---
- build.gradle | 30 ++--------------------
- 42 files changed, 66 insertions(+), 250 deletions(-)
-
-diff --git a/base/annotations/build.gradle b/base/annotations/build.gradle
-index dbfcea6..d448bbf 100644
---- a/base/annotations/build.gradle
-+++ b/base/annotations/build.gradle
-@@ -1,13 +1,10 @@
+--- a/annotations/build.gradle
++++ b/annotations/build.gradle
+@@ -1,5 +1,4 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
-+
-
- group = 'com.android.tools'
- archivesBaseName = 'annotations'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- project.ext.pomName = 'Android Tools Annotations library'
- project.ext.pomDesc = 'annotations used throughout the Android tools libraries.'
+ sourceCompatibility = JavaVersion.VERSION_1_6
+ targetCompatibility = JavaVersion.VERSION_1_6
+@@ -15,8 +14,4 @@
+ if (JavaVersion.current().isJava8Compatible()) {
+ options.addStringOption 'Xdoclint:none', '-quiet'
+ }
+-}
+-
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/asset-studio/build.gradle b/base/asset-studio/build.gradle
-index 1e186ad..35c11b6 100644
---- a/base/asset-studio/build.gradle
-+++ b/base/asset-studio/build.gradle
-@@ -1,10 +1,9 @@
++}
+\ No newline at end of file
+--- a/asset-studio/build.gradle
++++ b/asset-studio/build.gradle
+@@ -1,6 +1,5 @@
apply plugin: 'java'
-apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -82,15 +32,8 @@ index 1e186ad..35c11b6 100644
group = 'com.android.tools'
archivesBaseName = 'asset-studio'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:layoutlib-api')
-diff --git a/base/build-system/builder-model/build.gradle b/base/build-system/builder-model/build.gradle
-index 0f2fc5f..123de89 100644
---- a/base/build-system/builder-model/build.gradle
-+++ b/base/build-system/builder-model/build.gradle
+--- a/build-system/builder-model/build.gradle
++++ b/build-system/builder-model/build.gradle
@@ -1,6 +1,5 @@
apply plugin: 'java'
-apply plugin: 'clone-artifacts'
@@ -99,18 +42,9 @@ index 0f2fc5f..123de89 100644
dependencies {
compile project(':base:annotations')
-@@ -8,20 +7,16 @@ dependencies {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'builder-model'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
+@@ -15,13 +14,9 @@
- project.ext.pomName = 'Android Builder Model library'
- project.ext.pomDesc = 'Model for the Builder library.'
-
--project.ext.apiVersion = rootProject.ext.apiVersion ?: 0
-+project.ext.apiVersion = '3'
+ project.ext.apiVersion = rootProject.ext.apiVersion ?: 0
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
@@ -122,17 +56,15 @@ index 0f2fc5f..123de89 100644
}
def generated = new File("${project.buildDir}/generated/java")
-@@ -53,4 +48,4 @@ public final class Version {
+@@ -53,4 +48,4 @@
"""
}
-tasks.compileJava.dependsOn generateVersionConstantsJava
\ No newline at end of file
+tasks.compileJava.dependsOn generateVersionConstantsJava
-diff --git a/base/build-system/builder-test-api/build.gradle b/base/build-system/builder-test-api/build.gradle
-index d24b00f..07524a0 100644
---- a/base/build-system/builder-test-api/build.gradle
-+++ b/base/build-system/builder-test-api/build.gradle
+--- a/build-system/builder-test-api/build.gradle
++++ b/build-system/builder-test-api/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'java'
-apply plugin: 'jacoco'
@@ -140,13 +72,7 @@ index d24b00f..07524a0 100644
dependencies {
compile project(':base:ddmlib')
-@@ -10,12 +8,8 @@ dependencies {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'builder-test-api'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
-
+@@ -15,7 +13,3 @@
project.ext.pomName = 'Android Builder Test API library'
project.ext.pomDesc = 'API for the Test extension point in the Builder library.'
@@ -154,10 +80,8 @@ index d24b00f..07524a0 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-
-diff --git a/base/build-system/builder/build.gradle b/base/build-system/builder/build.gradle
-index 050a4a1..c1379b6 100644
---- a/base/build-system/builder/build.gradle
-+++ b/base/build-system/builder/build.gradle
+--- a/build-system/builder/build.gradle
++++ b/build-system/builder/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'java'
-apply plugin: 'clone-artifacts'
@@ -165,22 +89,16 @@ index 050a4a1..c1379b6 100644
evaluationDependsOn(':base:builder-model')
evaluationDependsOn(':base:builder-test-api')
-@@ -27,7 +25,7 @@ dependencies {
- testCompile 'junit:junit:4.12'
+@@ -28,7 +26,7 @@
testCompile 'org.mockito:mockito-all:1.9.5'
+ testCompile 'com.google.truth:truth:0.28'
testCompile project(':base:testutils')
- testCompile project(':base:sdklib').sourceSets.test.output
+ testCompile project(':base:sdklib')
}
test {
-@@ -36,14 +34,11 @@ test {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'builder'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
-
+@@ -42,9 +40,6 @@
project.ext.pomName = 'Android Builder library'
project.ext.pomDesc = 'Library to build Android applications.'
@@ -190,27 +108,7 @@ index 050a4a1..c1379b6 100644
jar.manifest.attributes("Builder-Version": version)
-@@ -58,8 +53,6 @@ sourceSets {
- }
-
- task generateVersionConstantsJava {
-- inputs.property("apiVersion", apiVersion)
-- inputs.property("version", version)
- ext.versionFile = new File(generated, "com/android/builder/Version.java")
- outputs.file(versionFile)
- }
-@@ -70,8 +63,8 @@ package com.android.builder;
-
- public final class Version {
- private Version() {}
-- public static final String ANDROID_GRADLE_PLUGIN_VERSION = "$version";
-- public static final int BUILDER_MODEL_API_VERSION = $apiVersion;
-+ public static final String ANDROID_GRADLE_PLUGIN_VERSION = "1.5";
-+ public static final int BUILDER_MODEL_API_VERSION = 3;
- }
- """
- }
-@@ -95,11 +88,7 @@ dependencies {
+@@ -98,11 +93,7 @@
sourceSets.main.compileClasspath += [configurations.provided]
sourceSets.test.runtimeClasspath += [configurations.provided]
tasks.compileJava.dependsOn(configurations.provided)
@@ -218,15 +116,14 @@ index 050a4a1..c1379b6 100644
tasks.jar {
from({zipTree(configurations.provided.singleFile)})
- }
+-}
-tasks.sourcesJar {
- from({zipTree(configurations.sourcesProvided.singleFile)})
-}
++}
\ No newline at end of file
-diff --git a/base/build-system/google-services/build.gradle b/base/build-system/google-services/build.gradle
-index e5afe75..663364e 100644
---- a/base/build-system/google-services/build.gradle
-+++ b/base/build-system/google-services/build.gradle
+--- a/build-system/google-services/build.gradle
++++ b/build-system/google-services/build.gradle
@@ -1,7 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'clone-artifacts'
@@ -235,13 +132,7 @@ index e5afe75..663364e 100644
dependencies {
compile gradleApi()
-@@ -16,13 +13,11 @@ ext {
-
- group = 'com.google.gms'
- archivesBaseName = 'google-services'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
-
+@@ -21,8 +18,6 @@
project.ext.pomName = 'Gradle Plug-in for Google Services'
project.ext.pomDesc = 'Gradle plug-in for Google Services'
@@ -250,32 +141,16 @@ index e5afe75..663364e 100644
groovydoc {
exclude "**/internal/**"
-diff --git a/base/build-system/gradle-core/build.gradle b/base/build-system/gradle-core/build.gradle
-index 2505e6d..f9ce6ed 100644
---- a/base/build-system/gradle-core/build.gradle
-+++ b/base/build-system/gradle-core/build.gradle
+--- a/build-system/gradle-core/build.gradle
++++ b/build-system/gradle-core/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'jacoco'
-apply plugin: 'clone-artifacts'
+ apply plugin: 'antlr'
configurations {
- provided
-@@ -20,6 +18,7 @@ dependencies {
- compile project(':base:builder')
- compile project(':base:lint')
- compile "net.sf.proguard:proguard-gradle:${project.ext.proguardVersion}"
-+ compile "org.codehaus.groovy:groovy-all:2.3.8"
-
- // Add gradleApi to classpath for compilation, but use provided configuration so that groovy is
- // not exposed as a runtime dependency.
-@@ -36,13 +35,11 @@ tasks.compileJava.dependsOn ":setupGradleInIde"
-
- group = 'com.android.tools.build'
- archivesBaseName = 'gradle-core'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
-
+@@ -75,8 +73,6 @@
project.ext.pomName = 'Core Library for Android Gradle Plug-in'
project.ext.pomDesc = 'Core library to build Android Gradle plugin.'
@@ -284,10 +159,8 @@ index 2505e6d..f9ce6ed 100644
test {
environment("CUSTOM_REPO", rootProject.file("../out/repo"))
-diff --git a/base/build-system/gradle-experimental/build.gradle b/base/build-system/gradle-experimental/build.gradle
-index 9e9154a..ce579e0 100644
---- a/base/build-system/gradle-experimental/build.gradle
-+++ b/base/build-system/gradle-experimental/build.gradle
+--- a/build-system/gradle-experimental/build.gradle
++++ b/build-system/gradle-experimental/build.gradle
@@ -1,7 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'clone-artifacts'
@@ -295,14 +168,8 @@ index 9e9154a..ce579e0 100644
-apply plugin: 'jacoco'
// Extract gradle libraries to ensure gradle-core is compatible with older version.
- String gradleVersion = "2.5"
-@@ -29,13 +26,11 @@ dependencies {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'gradle-experimental'
--version = rootProject.ext.experimentalVersion
-+version = '0.4.0'
-
+ String gradleVersion = "2.10"
+@@ -32,8 +29,6 @@
project.ext.pomName = 'Gradle Plug-in for Android Using Component Model'
project.ext.pomDesc = 'Gradle plug-in to build Android applications.'
@@ -311,10 +178,8 @@ index 9e9154a..ce579e0 100644
jar.manifest.attributes("Plugin-Version": version)
jar.manifest.attributes("Inception-Date":"${Calendar.getInstance().get(Calendar.YEAR)}:" +
-diff --git a/base/build-system/gradle/build.gradle b/base/build-system/gradle/build.gradle
-index 5bcf41f..b36e23e 100644
---- a/base/build-system/gradle/build.gradle
-+++ b/base/build-system/gradle/build.gradle
+--- a/build-system/gradle/build.gradle
++++ b/build-system/gradle/build.gradle
@@ -1,8 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'clone-artifacts'
@@ -324,13 +189,7 @@ index 5bcf41f..b36e23e 100644
dependencies {
compile project(':base:gradle-core')
-@@ -14,14 +10,11 @@ dependencies {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'gradle'
--version = rootProject.ext.buildVersion
-+version = '1.5.0'
-
+@@ -19,9 +15,6 @@
project.ext.pomName = 'Gradle Plug-in for Android'
project.ext.pomDesc = 'Gradle plug-in to build Android applications.'
@@ -340,49 +199,32 @@ index 5bcf41f..b36e23e 100644
jar.manifest.attributes("Plugin-Version": version)
jar.manifest.attributes("Inception-Date":"${Calendar.getInstance().get(Calendar.YEAR)}:" +
"${Calendar.getInstance().get(Calendar.MONTH)}:${Calendar.getInstance().get(Calendar.DATE)}")
-diff --git a/base/build-system/integration-test/build.gradle b/base/build-system/integration-test/build.gradle
-index 36a3527..ae0d7e5 100644
---- a/base/build-system/integration-test/build.gradle
-+++ b/base/build-system/integration-test/build.gradle
+--- a/build-system/integration-test/build.gradle
++++ b/build-system/integration-test/build.gradle
@@ -1,5 +1,4 @@
apply plugin: 'groovy'
-apply plugin: 'jacoco'
repositories {
maven { url = uri(rootProject.cloneArtifacts.repository) }
-@@ -30,8 +29,8 @@ dependencies {
- def testEnvironment = [
- PROJECT_BUILD_DIR: project.buildDir,
- CUSTOM_REPO: rootProject.file("../out/repo"),
-- CUSTOM_GRADLE: System.env.CUSTOM_GRADLE ?: rootProject.ext.buildVersion,
-- CUSTOM_EXPERIMENTAL_GRADLE: System.env.CUSTOM_EXPERIMENTAL_GRADLE ?:rootProject.ext.experimentalVersion,
-+ CUSTOM_GRADLE: System.env.CUSTOM_GRADLE ?: '1.5.0',
-+ CUSTOM_EXPERIMENTAL_GRADLE: System.env.CUSTOM_EXPERIMENTAL_GRADLE ?:'0.4.0',
- ANDROID_HOME: System.env.ANDROID_HOME,
- ANDROID_NDK_HOME: System.env.ANDROID_NDK_HOME,
- CUSTOM_BUILDTOOLS: System.env.CUSTOM_BUILDTOOLS,
-diff --git a/base/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle b/base/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
-index 82e0baa..2dfbb57 100644
---- a/base/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
-+++ b/base/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
+--- a/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
++++ b/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
@@ -1,5 +1,4 @@
apply plugin: 'java'
-apply plugin: 'idea'
def env = new Object() {
String gradleVersion
-@@ -11,4 +10,4 @@ apply from: "../../commonLocalRepo.gradle"
+@@ -11,4 +10,4 @@
dependencies {
compile "com.android.tools.build:builder-test-api:$env.gradleVersion"
-}
\ No newline at end of file
+}
-diff --git a/base/build-system/manifest-merger/build.gradle b/base/build-system/manifest-merger/build.gradle
-index 3ca48a0..4d3d7db 100644
---- a/base/build-system/manifest-merger/build.gradle
-+++ b/base/build-system/manifest-merger/build.gradle
-@@ -1,12 +1,12 @@
+--- a/build-system/manifest-merger/build.gradle
++++ b/build-system/manifest-merger/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -390,14 +232,7 @@ index 3ca48a0..4d3d7db 100644
evaluationDependsOn(':base:sdklib')
- group = 'com.android.tools.build'
- archivesBaseName = 'manifest-merger'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -32,7 +32,4 @@ test {
+@@ -32,7 +32,4 @@
project.ext.pomName = 'Android Tools Manifest Merger library'
project.ext.pomDesc = 'A Library to merge Android manifests.'
@@ -405,10 +240,8 @@ index 3ca48a0..4d3d7db 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/build-system/project-test-lib/build.gradle b/base/build-system/project-test-lib/build.gradle
-index 82ddb41..d7fc943 100644
---- a/base/build-system/project-test-lib/build.gradle
-+++ b/base/build-system/project-test-lib/build.gradle
+--- a/build-system/project-test-lib/build.gradle
++++ b/build-system/project-test-lib/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'java'
-apply plugin: 'clone-artifacts'
@@ -416,10 +249,8 @@ index 82ddb41..d7fc943 100644
def toolingApiVersion = gradle.gradleVersion
dependencies {
-diff --git a/base/build-system/project-test/build.gradle b/base/build-system/project-test/build.gradle
-index b28ca5d..c4b0060 100644
---- a/base/build-system/project-test/build.gradle
-+++ b/base/build-system/project-test/build.gradle
+--- a/build-system/project-test/build.gradle
++++ b/build-system/project-test/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'java'
-apply plugin: 'clone-artifacts'
@@ -427,39 +258,15 @@ index b28ca5d..c4b0060 100644
apply plugin: 'application'
dependencies {
-diff --git a/base/build.gradle b/base/build.gradle
-index b07f6c9..7a52da9 100644
---- a/base/build.gradle
-+++ b/base/build.gradle
-@@ -2,6 +2,5 @@ subprojects { Project project ->
- // only configure leaf projects.
- if (!project.getSubprojects().isEmpty()) return
-
-- apply from: "$rootDir/buildSrc/base/baseJava.gradle"
- }
-
-diff --git a/base/chartlib/build.gradle b/base/chartlib/build.gradle
-index 24c58d6..dff471b 100644
---- a/base/chartlib/build.gradle
-+++ b/base/chartlib/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'jacoco'
-
- group = 'com.android.tools.chartlib'
- archivesBaseName = 'chartlib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -14,4 +14,3 @@ dependencies {
+--- a/chartlib/build.gradle
++++ b/chartlib/build.gradle
+@@ -14,4 +14,3 @@
project.ext.pomName = 'Android Tools chartlib'
project.ext.pomDesc = 'Library with Swing chart widgets'
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/common/build.gradle b/base/common/build.gradle
-index 904c8f9..21ef059 100644
---- a/base/common/build.gradle
-+++ b/base/common/build.gradle
+--- a/common/build.gradle
++++ b/common/build.gradle
@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
@@ -468,24 +275,16 @@ index 904c8f9..21ef059 100644
dependencies {
compile project(':base:annotations')
-@@ -11,11 +11,8 @@ dependencies {
-
- group = 'com.android.tools'
- archivesBaseName = 'common'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
+@@ -17,6 +17,3 @@
project.ext.pomName = 'Android Tools common library'
project.ext.pomDesc = 'common library used by other Android tools libraries.'
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/ddmlib/build.gradle b/base/ddmlib/build.gradle
-index fd300c1..5695891 100644
---- a/base/ddmlib/build.gradle
-+++ b/base/ddmlib/build.gradle
-@@ -1,10 +1,10 @@
+--- a/ddmlib/build.gradle
++++ b/ddmlib/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -493,22 +292,15 @@ index fd300c1..5695891 100644
group = 'com.android.tools.ddms'
archivesBaseName = 'ddmlib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -23,6 +23,3 @@ sourceSets {
+@@ -23,6 +23,3 @@
project.ext.pomName = 'Android Tools ddmlib'
project.ext.pomDesc = 'Library providing APIs to talk to Android devices'
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/device_validator/dvlib/build.gradle b/base/device_validator/dvlib/build.gradle
-index 4111d48..4feee01 100644
---- a/base/device_validator/dvlib/build.gradle
-+++ b/base/device_validator/dvlib/build.gradle
+--- a/device_validator/dvlib/build.gradle
++++ b/device_validator/dvlib/build.gradle
@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
@@ -517,12 +309,8 @@ index 4111d48..4feee01 100644
dependencies {
compile project(':base:common')
-@@ -9,14 +9,10 @@ dependencies {
-
- group = 'com.android.tools'
- archivesBaseName = 'dvlib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
+@@ -12,11 +12,7 @@
+ version = rootProject.ext.baseVersion
// configure the manifest of the sdkJar task
-sdkJar.manifest.attributes("Main-Class": "com.android.validator.DeviceValidator")
@@ -533,11 +321,9 @@ index 4111d48..4feee01 100644
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/draw9patch/build.gradle b/base/draw9patch/build.gradle
-index b54a7f0..0a2fd6b 100644
---- a/base/draw9patch/build.gradle
-+++ b/base/draw9patch/build.gradle
-@@ -1,10 +1,10 @@
+--- a/draw9patch/build.gradle
++++ b/draw9patch/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -545,12 +331,7 @@ index b54a7f0..0a2fd6b 100644
group = 'com.android.tools'
archivesBaseName = 'draw9patch'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- testCompile 'junit:junit:4.12'
-@@ -15,16 +15,3 @@ sourceSets {
+@@ -15,16 +15,3 @@
test.resources.srcDir 'src/test/java'
}
@@ -567,11 +348,9 @@ index b54a7f0..0a2fd6b 100644
-}
-
-sdkJar.manifest.attributes("Main-Class": "com.android.draw9patch.Application")
-diff --git a/base/jack/jack-api/build.gradle b/base/jack/jack-api/build.gradle
-index d5bf9de..f7f2260 100644
---- a/base/jack/jack-api/build.gradle
-+++ b/base/jack/jack-api/build.gradle
-@@ -17,9 +17,6 @@ compileJava.classpath += configurations.provided
+--- a/jack/jack-api/build.gradle
++++ b/jack/jack-api/build.gradle
+@@ -17,9 +17,6 @@
project.ext.pomName = 'Android Jack API'
project.ext.pomDesc = 'API to dynamically load Jack'
@@ -581,11 +360,9 @@ index d5bf9de..f7f2260 100644
javadoc {
classpath += configurations.provided
-diff --git a/base/jack/jill-api/build.gradle b/base/jack/jill-api/build.gradle
-index 5c0edf4..5668fdc 100644
---- a/base/jack/jill-api/build.gradle
-+++ b/base/jack/jill-api/build.gradle
-@@ -17,9 +17,6 @@ compileJava.classpath += configurations.provided
+--- a/jack/jill-api/build.gradle
++++ b/jack/jill-api/build.gradle
+@@ -17,9 +17,6 @@
project.ext.pomName = 'Android Jill API'
project.ext.pomDesc = 'API to dynamically load Jill'
@@ -595,10 +372,8 @@ index 5c0edf4..5668fdc 100644
javadoc {
classpath += configurations.provided
-diff --git a/base/jobb/build.gradle b/base/jobb/build.gradle
-index bf112f1..ba3eaba 100644
---- a/base/jobb/build.gradle
-+++ b/base/jobb/build.gradle
+--- a/jobb/build.gradle
++++ b/jobb/build.gradle
@@ -1,5 +1,5 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
@@ -606,12 +381,8 @@ index bf112f1..ba3eaba 100644
dependencies {
compile project(':external:fat32lib')
-@@ -7,19 +7,7 @@ dependencies {
-
- group = 'com.android.tools.build'
- archivesBaseName = 'jobb'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
+@@ -10,16 +10,4 @@
+ version = rootProject.ext.baseVersion
// configure the manifest of the sdkJar task
-sdkJar.manifest.attributes("Main-Class": "com.android.jobb.Main")
@@ -627,11 +398,9 @@ index bf112f1..ba3eaba 100644
- item 'etc/jobb.bat'
- }
-}
-diff --git a/base/layoutlib-api/build.gradle b/base/layoutlib-api/build.gradle
-index 2ac4682..8fdaabc 100644
---- a/base/layoutlib-api/build.gradle
-+++ b/base/layoutlib-api/build.gradle
-@@ -1,10 +1,10 @@
+--- a/layoutlib-api/build.gradle
++++ b/layoutlib-api/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -639,12 +408,7 @@ index 2ac4682..8fdaabc 100644
group = 'com.android.tools.layoutlib'
archivesBaseName = 'layoutlib-api'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -18,7 +18,4 @@ dependencies {
+@@ -18,7 +18,4 @@
project.ext.pomName = 'Android Tools layoutlib-api'
project.ext.pomDesc = 'Library to use the rendering library for Android layouts: layoutlib'
@@ -652,26 +416,8 @@ index 2ac4682..8fdaabc 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/legacy/ant-tasks/build.gradle b/base/legacy/ant-tasks/build.gradle
-index 65288b6..38e6674 100644
---- a/base/legacy/ant-tasks/build.gradle
-+++ b/base/legacy/ant-tasks/build.gradle
-@@ -1,9 +1,9 @@
- apply plugin: 'java'
--apply plugin: 'sdk-java-lib'
-+
-
- group = 'com.android.tools.build'
- archivesBaseName = 'ant-tasks'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:manifest-merger')
-diff --git a/base/legacy/archquery/build.gradle b/base/legacy/archquery/build.gradle
-index f38f236..1f17700 100644
---- a/base/legacy/archquery/build.gradle
-+++ b/base/legacy/archquery/build.gradle
+--- a/legacy/archquery/build.gradle
++++ b/legacy/archquery/build.gradle
@@ -1,9 +1,8 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
@@ -679,16 +425,13 @@ index f38f236..1f17700 100644
group = 'com.android.tools'
archivesBaseName = 'archquery'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
+ version = rootProject.ext.baseVersion
// configure the manifest of the sdkJar task.
-sdkJar.manifest.attributes("Main-Class": "com.android.archquery.Main")
-diff --git a/base/lint/cli/build.gradle b/base/lint/cli/build.gradle
-index 7d7fe85..5ffa9e5 100644
---- a/base/lint/cli/build.gradle
-+++ b/base/lint/cli/build.gradle
-@@ -1,10 +1,10 @@
+--- a/lint/cli/build.gradle
++++ b/lint/cli/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -696,12 +439,7 @@ index 7d7fe85..5ffa9e5 100644
group = 'com.android.tools.lint'
archivesBaseName = 'lint'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:lint-checks')
-@@ -20,24 +20,10 @@ test {
+@@ -20,24 +20,10 @@
maxParallelForks = Runtime.runtime.availableProcessors() / 2
}
@@ -727,11 +465,9 @@ index 7d7fe85..5ffa9e5 100644
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/lint/libs/lint-api/build.gradle b/base/lint/libs/lint-api/build.gradle
-index df9d553..2ab953e 100644
---- a/base/lint/libs/lint-api/build.gradle
-+++ b/base/lint/libs/lint-api/build.gradle
-@@ -1,10 +1,10 @@
+--- a/lint/libs/lint-api/build.gradle
++++ b/lint/libs/lint-api/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -739,12 +475,7 @@ index df9d553..2ab953e 100644
group = 'com.android.tools.lint'
archivesBaseName = 'lint-api'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:sdk-common')
-@@ -23,7 +23,4 @@ sourceSets {
+@@ -23,7 +23,4 @@
project.ext.pomName = 'Android Tools Lint API'
project.ext.pomDesc = 'API to build lint checks'
@@ -752,11 +483,9 @@ index df9d553..2ab953e 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/lint/libs/lint-checks/build.gradle b/base/lint/libs/lint-checks/build.gradle
-index b71cb35..b5f24dc 100644
---- a/base/lint/libs/lint-checks/build.gradle
-+++ b/base/lint/libs/lint-checks/build.gradle
-@@ -1,10 +1,10 @@
+--- a/lint/libs/lint-checks/build.gradle
++++ b/lint/libs/lint-checks/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -764,12 +493,7 @@ index b71cb35..b5f24dc 100644
group = 'com.android.tools.lint'
archivesBaseName = 'lint-checks'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:lint-api')
-@@ -19,7 +19,4 @@ sourceSets {
+@@ -19,7 +19,4 @@
project.ext.pomName = 'Android Lint Checks'
project.ext.pomDesc = 'Checks for Android Lint'
@@ -777,20 +501,9 @@ index b71cb35..b5f24dc 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/lint/libs/lint-tests/build.gradle b/base/lint/libs/lint-tests/build.gradle
-index 7781b8a..c55c01f 100644
---- a/base/lint/libs/lint-tests/build.gradle
-+++ b/base/lint/libs/lint-tests/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'jacoco'
-
- group = 'com.android.tools.lint'
- archivesBaseName = 'lint-tests'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:lint')
-@@ -24,7 +24,4 @@ sourceSets {
+--- a/lint/libs/lint-tests/build.gradle
++++ b/lint/libs/lint-tests/build.gradle
+@@ -24,7 +24,4 @@
project.ext.pomName = 'Android Tools Lint Test API'
project.ext.pomDesc = 'API to build lint check tests'
@@ -798,21 +511,16 @@ index 7781b8a..c55c01f 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/misc/screenshot2/build.gradle b/base/misc/screenshot2/build.gradle
-index 51a060f..8704ad4 100644
---- a/base/misc/screenshot2/build.gradle
-+++ b/base/misc/screenshot2/build.gradle
-@@ -1,22 +1,11 @@
+--- a/misc/screenshot2/build.gradle
++++ b/misc/screenshot2/build.gradle
+@@ -1,5 +1,5 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
+
group = 'com.android.tools'
archivesBaseName = 'screenshot2'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
+@@ -9,14 +9,3 @@
compile project(':base:ddmlib')
}
@@ -827,11 +535,9 @@ index 51a060f..8704ad4 100644
-
-// configure the manifest of the sdkJar task.
-sdkJar.manifest.attributes("Main-Class": "com.android.screenshot.Screenshot")
-diff --git a/base/ninepatch/build.gradle b/base/ninepatch/build.gradle
-index 7699e1b..17a49b6 100644
---- a/base/ninepatch/build.gradle
-+++ b/base/ninepatch/build.gradle
-@@ -1,10 +1,10 @@
+--- a/ninepatch/build.gradle
++++ b/ninepatch/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -839,82 +545,39 @@ index 7699e1b..17a49b6 100644
group = 'com.android.tools'
archivesBaseName = 'ninepatch'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- testCompile 'junit:junit:4.12'
-diff --git a/base/perflib/build.gradle b/base/perflib/build.gradle
-index a923c0d..dae11eb 100644
---- a/base/perflib/build.gradle
-+++ b/base/perflib/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'jacoco'
-
- group = 'com.android.tools.perflib'
- archivesBaseName = 'perflib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:ddmlib')
-@@ -17,4 +17,3 @@ dependencies {
+--- a/perflib/build.gradle
++++ b/perflib/build.gradle
+@@ -17,4 +17,3 @@
project.ext.pomName = 'Android Tools perflib'
project.ext.pomDesc = 'Library to handle android performance data'
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/rpclib/build.gradle b/base/rpclib/build.gradle
-index bccfc24..69be33b 100644
---- a/base/rpclib/build.gradle
-+++ b/base/rpclib/build.gradle
-@@ -2,7 +2,7 @@ apply plugin: 'java'
-
- group = 'com.android.tools.rpclib'
- archivesBaseName = 'rpclib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -13,4 +13,3 @@ dependencies {
+--- a/rpclib/build.gradle
++++ b/rpclib/build.gradle
+@@ -13,4 +13,3 @@
project.ext.pomName = 'Android Tools rpclib'
project.ext.pomDesc = 'Library to handle Gaze RPC'
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/rule-api/build.gradle b/base/rule-api/build.gradle
-index ed2f763..b7937cc 100644
---- a/base/rule-api/build.gradle
-+++ b/base/rule-api/build.gradle
-@@ -1,9 +1,9 @@
+--- a/rule-api/build.gradle
++++ b/rule-api/build.gradle
+@@ -1,5 +1,5 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
+
group = 'com.android.tools'
archivesBaseName = 'rule-api'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-diff --git a/base/sdk-common/build.gradle b/base/sdk-common/build.gradle
-index cc946c4..f432f69 100644
---- a/base/sdk-common/build.gradle
-+++ b/base/sdk-common/build.gradle
-@@ -1,11 +1,11 @@
+--- a/sdk-common/build.gradle
++++ b/sdk-common/build.gradle
+@@ -1,6 +1,5 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
-+
- apply plugin: 'application'
group = 'com.android.tools'
archivesBaseName = 'sdk-common'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
- mainClassName = 'com.android.ide.common.vectordrawable.VdPreview'
-
- dependencies {
-@@ -23,7 +23,4 @@ dependencies {
+@@ -23,7 +22,4 @@
project.ext.pomName = 'Android Tools sdk-common library'
project.ext.pomDesc = 'sdk-common library used by other Android tools libraries.'
@@ -922,10 +585,8 @@ index cc946c4..f432f69 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/sdk-common/generate-locale-data/build.gradle b/base/sdk-common/generate-locale-data/build.gradle
-index 2531629..7535bcb 100644
---- a/base/sdk-common/generate-locale-data/build.gradle
-+++ b/base/sdk-common/generate-locale-data/build.gradle
+--- a/sdk-common/generate-locale-data/build.gradle
++++ b/sdk-common/generate-locale-data/build.gradle
@@ -1,5 +1,5 @@
apply plugin: 'java'
-apply plugin: 'sdk-java-lib'
@@ -933,18 +594,14 @@ index 2531629..7535bcb 100644
dependencies {
compile project(':base:sdk-common')
-@@ -9,5 +9,4 @@ dependencies {
-
+@@ -10,4 +10,3 @@
group = 'com.android.tools'
archivesBaseName = 'generate-locale-data'
--version = rootProject.ext.baseVersion
+ version = rootProject.ext.baseVersion
-sdkJar.manifest.attributes("Main-Class": "com.android.ide.common.generate.locale.LocaleTableGenerator")
-+version = '24.5.0'
-diff --git a/base/sdklib/build.gradle b/base/sdklib/build.gradle
-index bc76ff4..fd3c225 100644
---- a/base/sdklib/build.gradle
-+++ b/base/sdklib/build.gradle
-@@ -1,12 +1,12 @@
+--- a/sdklib/build.gradle
++++ b/sdklib/build.gradle
+@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'jacoco'
-apply plugin: 'sdk-java-lib'
@@ -952,14 +609,7 @@ index bc76ff4..fd3c225 100644
evaluationDependsOn(':base:dvlib')
- group = 'com.android.tools'
- archivesBaseName = 'sdklib'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:layoutlib-api')
-@@ -62,7 +62,4 @@ copyXsd.doLast {
+@@ -64,7 +64,4 @@
project.ext.pomName = 'Android Tools sdklib'
project.ext.pomDesc = 'A library to parse and download the Android SDK.'
@@ -967,23 +617,8 @@ index bc76ff4..fd3c225 100644
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/base/sdklib/test.gradle b/base/sdklib/test.gradle
-index 4324376..1c402d0 100755
---- a/base/sdklib/test.gradle
-+++ b/base/sdklib/test.gradle
-@@ -5,7 +5,7 @@ evaluationDependsOn(':base:dvlib')
-
- group = 'com.android.tools'
- archivesBaseName = 'sdklib-test'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:sdklib')
-diff --git a/base/templates/build.gradle b/base/templates/build.gradle
-index 238c922..e69de29 100644
---- a/base/templates/build.gradle
-+++ b/base/templates/build.gradle
+--- a/templates/build.gradle
++++ b/templates/build.gradle
@@ -1,10 +0,0 @@
-apply plugin: 'sdk-files'
-
@@ -996,115 +631,12 @@ index 238c922..e69de29 100644
- }
-}
\ No newline at end of file
-diff --git a/base/testutils/build.gradle b/base/testutils/build.gradle
-index b69a4fb..8b8deb3 100644
---- a/base/testutils/build.gradle
-+++ b/base/testutils/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'jacoco'
-
- group = 'com.android.tools'
- archivesBaseName = 'testutils'
--version = rootProject.ext.baseVersion
-+version = '24.5.0'
-
- dependencies {
- compile project(':base:common')
-@@ -19,6 +19,3 @@ sourceSets {
+--- a/testutils/build.gradle
++++ b/testutils/build.gradle
+@@ -19,6 +19,3 @@
project.ext.pomName = 'Android Tools Test Utilities'
project.ext.pomDesc = 'API used by lint testing infrastructure'
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
-diff --git a/build.gradle b/build.gradle
-index a6c30b5..bf35058 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -1,15 +1,6 @@
--apply plugin: 'clone-artifacts'
-
- // Currently, the minimum requirement to run Android SDK tools is Java 1.6
- // So make sure that we are compiling with 1.6
--task('checkJavaVersion') << {
-- def jvmVersion = System.getProperty('java.version')
-- def requiredVersion = System.getenv('JAVA_FOR_TESTS') ?: '1.6'
-- if (!jvmVersion.startsWith(requiredVersion)) {
-- throw new RuntimeException("Tools need to be compiled with Java $requiredVersion, you are using Java $jvmVersion.")
-- }
--}
--final def checkJavaVersionTask = tasks['checkJavaVersion']
-
- allprojects { subproject ->
- tasks.withType(JavaForkOptions) {
-@@ -23,15 +14,10 @@ allprojects { subproject ->
- final def buildTasks = ['build', 'compileJava', 'compileGroovy', 'classes', 'assemble', 'javadoc', 'groovydoc', 'check']
- // Task.doFirst does not run if the task has no work to do. Need to be more aggressive than that.
- // Some projects won't have all of these tasks, so need to use findByName.
-- buildTasks.each { subproject.tasks.findByName(it)?.dependsOn(checkJavaVersionTask) }
-+ buildTasks.each { subproject.tasks.findByName(it) }
- }
- }
-
--// artifact cloning destinations
--cloneArtifacts {
-- repository = "$rootDir/../prebuilts/tools/common/m2/repository"
--}
--
- if (System.env.USE_EXTERNAL_REPO != null) {
- allprojects {
- repositories {
-@@ -55,7 +41,7 @@ if (System.env.DIST_DIR != null && System.env.OUT_DIR != null) {
- ext.androidHostDist = file(System.env.DIST_DIR)
- } else {
- // ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/
-- ext.androidHostOut = file("$rootDir/../out")
-+ ext.androidHostOut = file("$rootDir/out")
- ext.androidHostDist = new File(ext.androidHostOut, "dist")
- }
-
-@@ -64,14 +50,9 @@ if (System.env.DIST_DIR != null && System.env.OUT_DIR != null) {
- buildDir = new File(ext.androidHostOut, "build/root")
-
-
--// apply this after the buildDir has been changed.
--apply plugin: 'sdk-tools'
--
-
- ext.localRepo = project.hasProperty('localRepo') ? localRepo : "$ext.androidHostOut/repo"
-
--apply from: "$rootDir/buildSrc/base/version.gradle"
--
- subprojects { Project project ->
- // Change buildDir first so that all plugins pick up the new value.
- project.buildDir = project.file("$project.parent.buildDir/../$project.name/build")
-@@ -117,17 +98,12 @@ task setupGradleInIde << {
- if (gradleDistLink.exists()) {
- gradleDistLink.delete()
- }
-- String link = dir.path.substring(project.ext.androidHostOut.path.length() + 1)
-- String command = "ln -s $link ${gradleDistLink.path}"
-- command.execute()
- }
-
- // basic task for custom distribution of project should the build server.
- task dist << {
- }
-
--apply plugin: 'offline-repo'
--
- task clean << {
- delete 'build'
-
-@@ -137,7 +113,6 @@ task clean << {
- }
- }
- }
--apply plugin: 'presubmit-runner'
- // Task for initializing a fresh repo.
- task init {
- dependsOn prepareRepo
-@@ -150,4 +125,3 @@ task init {
- // The hierarchy viewer tests require loading SWT jar files.
- // That fails with the error saying "can't load 32 bit library on 64 bit JVM
- // Disable these tests from running until that is fixed
--tasks.findByPath(':swt:hierarchyviewer2lib:test').enabled = false
diff --git a/debian/patches/gradle-experimental.patch b/debian/patches/gradle-experimental.patch
index 6a1d793..0385bcd 100644
--- a/debian/patches/gradle-experimental.patch
+++ b/debian/patches/gradle-experimental.patch
@@ -1,62 +1,14 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sat, 6 Feb 2016 21:14:41 +0100
-Subject: gradle experimental
-
----
- base/build-system/gradle-experimental/build.gradle | 24 +++++++++++-----------
- build.gradle | 2 +-
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/base/build-system/gradle-experimental/build.gradle b/base/build-system/gradle-experimental/build.gradle
-index ce579e0..c224332 100644
---- a/base/build-system/gradle-experimental/build.gradle
-+++ b/base/build-system/gradle-experimental/build.gradle
-@@ -1,23 +1,23 @@
- apply plugin: 'groovy'
-
- // Extract gradle libraries to ensure gradle-core is compatible with older version.
--String gradleVersion = "2.5"
--File gradleBinary = file("$rootProject.projectDir/external/gradle/gradle-$gradleVersion-all.zip")
--File gradleLib = file("$rootProject.ext.androidHostOut/alternate-gradle/gradle-$gradleVersion/lib")
-+//String gradleVersion = "2.5"
-+//File gradleBinary = file("$rootProject.projectDir/external/gradle/gradle-$gradleVersion-all.zip")
-+//File gradleLib = file("$rootProject.ext.androidHostOut/alternate-gradle/gradle-$gradleVersion/lib")
-
--task extractGradleLibs(type: Copy) {
-- from zipTree(gradleBinary)
-- into gradleLib.parentFile.parentFile
--}
-+//task extractGradleLibs(type: Copy) {
-+// from zipTree(gradleBinary)
-+// into gradleLib.parentFile.parentFile
-+//}
-
--compileJava.dependsOn extractGradleLibs
-+//compileJava.dependsOn extractGradleLibs
-
--task setupGradleInIde {
-- dependsOn extractGradleLibs
--}
-+//task setupGradleInIde {
-+// dependsOn extractGradleLibs
-+//}
+Author: Markus Koschany <apo at debian.org>
+ Kai-Chung Yan
+Last-Update: 2016-07-19
+Description: gradle experimental
+--- a/build-system/gradle-experimental/build.gradle
++++ b/build-system/gradle-experimental/build.gradle
+@@ -15,7 +15,6 @@
+ }
dependencies {
- compile fileTree(dir:gradleLib)
-+ //compile fileTree(dir:gradleLib)
compile project(':base:gradle-core')
testCompile 'junit:junit:4.12'
-diff --git a/build.gradle b/build.gradle
-index bf35058..6674c9a 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -118,7 +118,7 @@ task init {
- dependsOn prepareRepo
- dependsOn setupGradleInIde
- dependsOn copyGradleProperty
-- dependsOn tasks.findByPath(':base:gradle-experimental:setupGradleInIde')
-+//dependsOn tasks.findByPath(':base:gradle-experimental:setupGradleInIde')
- dependsOn tasks.findByPath(':base:builder:generateVersionConstantsJava')
- }
-
diff --git a/debian/patches/libhttpcore-java-ThreadSafe.patch b/debian/patches/libhttpcore-java-ThreadSafe.patch
index 5804831..102d3f8 100644
--- a/debian/patches/libhttpcore-java-ThreadSafe.patch
+++ b/debian/patches/libhttpcore-java-ThreadSafe.patch
@@ -11,11 +11,9 @@ Forwarded: no
.../main/java/com/android/builder/core/DefaultManifestParser.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java b/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
-index 0d1f9f1..8c714a8 100644
---- a/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
-+++ b/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
-@@ -25,7 +25,8 @@ import com.android.xml.AndroidManifest;
+--- a/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
++++ b/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
+@@ -25,7 +25,8 @@
import com.android.xml.AndroidXPathFactory;
import com.google.common.base.Optional;
@@ -25,7 +23,7 @@ index 0d1f9f1..8c714a8 100644
import org.xml.sax.InputSource;
import java.io.File;
-@@ -34,7 +35,7 @@ import java.io.IOException;
+@@ -34,7 +35,7 @@
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpressionException;
diff --git a/debian/patches/project-test-lib.patch b/debian/patches/project-test-lib.patch
index ed7e007..62463c4 100644
--- a/debian/patches/project-test-lib.patch
+++ b/debian/patches/project-test-lib.patch
@@ -7,24 +7,19 @@ Subject: project-test-lib
base/build-system/gradle/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/base/build-system/gradle-core/build.gradle b/base/build-system/gradle-core/build.gradle
-index f9ce6ed..1fb5f80 100644
---- a/base/build-system/gradle-core/build.gradle
-+++ b/base/build-system/gradle-core/build.gradle
-@@ -27,7 +27,7 @@ dependencies {
-
- testCompile 'junit:junit:4.12'
+--- a/build-system/gradle-core/build.gradle
++++ b/build-system/gradle-core/build.gradle
+@@ -54,7 +54,6 @@
+ testCompile 'com.google.truth:truth:0.28'
testCompile 'org.mockito:mockito-all:1.9.5'
+ testCompile 'com.google.guava:guava:17.0'
- testCompile project(':base:project-test-lib')
-+ //testCompile project(':base:project-test-lib')
testCompile project(':base:testutils')
}
-diff --git a/base/build-system/gradle/build.gradle b/base/build-system/gradle/build.gradle
-index b36e23e..affa879 100644
---- a/base/build-system/gradle/build.gradle
-+++ b/base/build-system/gradle/build.gradle
-@@ -5,7 +5,7 @@ dependencies {
+--- a/build-system/gradle/build.gradle
++++ b/build-system/gradle/build.gradle
+@@ -5,7 +5,7 @@
compile gradleApi()
testCompile 'junit:junit:4.12'
diff --git a/debian/patches/series b/debian/patches/series
index b35733a..68a2803 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
build.gradle.patch
-settings.gradle.patch
gradle-experimental.patch
SdkTestCase.patch
project-test-lib.patch
diff --git a/debian/patches/settings.gradle.patch b/debian/patches/settings.gradle.patch
deleted file mode 100644
index 4bace0a..0000000
--- a/debian/patches/settings.gradle.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Fri, 22 Jan 2016 00:51:17 +0100
-Subject: settings.gradle
-
----
- settings.gradle | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/settings.gradle b/settings.gradle
-index eb684bb..87ad30e 100644
---- a/settings.gradle
-+++ b/settings.gradle
-@@ -4,13 +4,13 @@ include ':base:ant-tasks'
- include ':base:archquery'
- include ':base:asset-studio'
- include ':base:common'
--include ':base:docs'
-+//include ':base:docs'
- include ':base:ddmlib'
- include ':base:perflib'
- include ':base:chartlib'
- include ':base:draw9patch'
- include ':base:dvlib'
--include ':base:jobb'
-+//include ':base:jobb'
- include ':base:layoutlib-api'
- include ':base:lint'
- include ':base:lint-api'
-@@ -35,10 +35,10 @@ include ':base:builder'
- include ':base:gradle-model'
- include ':base:gradle-core'
- include ':base:gradle'
--include ':base:gradle-experimental'
--include ':base:integration-test'
--include ':base:project-test-lib'
--include ':base:project-test'
-+//include ':base:gradle-experimental'
-+//include ':base:integration-test'
-+//include ':base:project-test-lib'
-+//include ':base:project-test'
- include ':base:google-services'
-
- include ':base:templates'
-@@ -63,14 +63,14 @@ project(':base:builder-model' ).projectDir = new File(rootDir, 'base/build-
- project(':base:builder-test-api' ).projectDir = new File(rootDir, 'base/build-system/builder-test-api')
- project(':base:transform-api' ).projectDir = new File(rootDir, 'base/build-system/transform-api')
- project(':base:builder' ).projectDir = new File(rootDir, 'base/build-system/builder')
--project(':base:docs' ).projectDir = new File(rootDir, 'base/build-system/docs')
-+//project(':base:docs' ).projectDir = new File(rootDir, 'base/build-system/docs')
- project(':base:manifest-merger' ).projectDir = new File(rootDir, 'base/build-system/manifest-merger')
- project(':base:gradle-core' ).projectDir = new File(rootDir, 'base/build-system/gradle-core')
- project(':base:gradle' ).projectDir = new File(rootDir, 'base/build-system/gradle')
--project(':base:gradle-experimental').projectDir = new File(rootDir, 'base/build-system/gradle-experimental')
--project(':base:integration-test' ).projectDir = new File(rootDir, 'base/build-system/integration-test')
--project(':base:project-test-lib' ).projectDir = new File(rootDir, 'base/build-system/project-test-lib')
--project(':base:project-test' ).projectDir = new File(rootDir, 'base/build-system/project-test')
-+//project(':base:gradle-experimental').projectDir = new File(rootDir, 'base/build-system/gradle-experimental')
-+//project(':base:integration-test' ).projectDir = new File(rootDir, 'base/build-system/integration-test')
-+//project(':base:project-test-lib' ).projectDir = new File(rootDir, 'base/build-system/project-test-lib')
-+//project(':base:project-test' ).projectDir = new File(rootDir, 'base/build-system/project-test')
- project(':base:google-services' ).projectDir = new File(rootDir, 'base/build-system/google-services')
-
- include ':swt:chimpchat'
diff --git a/debian/patches/trove3.patch b/debian/patches/trove3.patch
index bc6ec92..e3e4873 100644
--- a/debian/patches/trove3.patch
+++ b/debian/patches/trove3.patch
@@ -12,11 +12,9 @@ Subject: trove3
.../android/tools/perflib/heap/analysis/TopologicalSort.java | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
-diff --git a/base/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java b/base/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java
-index d90b1b8..8138478 100644
---- a/base/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java
-+++ b/base/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java
-@@ -36,7 +36,7 @@ import java.util.Map;
+--- a/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java
++++ b/chartlib/src/main/java/com/android/tools/chartlib/TimelineComponent.java
+@@ -35,7 +35,7 @@
import javax.swing.Icon;
@@ -25,11 +23,9 @@ index d90b1b8..8138478 100644
/**
* A component to display a TimelineData object. It locks the timeline object to prevent
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java
-index 121c27c..213deae 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java
-@@ -19,7 +19,7 @@ package com.android.tools.perflib.heap;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/ClassObj.java
+@@ -19,7 +19,7 @@
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.annotations.VisibleForTesting;
@@ -38,7 +34,7 @@ index 121c27c..213deae 100644
import java.util.*;
-@@ -267,7 +267,7 @@ public class ClassObj extends Instance implements Comparable<ClassObj> {
+@@ -270,7 +270,7 @@
public int getInstanceCount() {
int count = 0;
@@ -47,7 +43,7 @@ index 121c27c..213deae 100644
count += ((HeapData)heapStat).mInstances.size();
}
return count;
-@@ -275,7 +275,7 @@ public class ClassObj extends Instance implements Comparable<ClassObj> {
+@@ -278,7 +278,7 @@
public int getShallowSize() {
int size = 0;
@@ -56,11 +52,9 @@ index 121c27c..213deae 100644
size += ((HeapData)heapStat).mShallowSize;
}
return size;
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java
-index 3d617e6..95d45dc 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java
-@@ -22,9 +22,9 @@ import java.util.ArrayList;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/Heap.java
+@@ -22,9 +22,9 @@
import java.util.Collection;
import com.google.common.collect.*;
@@ -73,7 +67,7 @@ index 3d617e6..95d45dc 100644
public class Heap {
-@@ -145,7 +145,7 @@ public class Heap {
+@@ -110,7 +110,7 @@
}
public final void dumpInstanceCounts() {
@@ -82,7 +76,7 @@ index 3d617e6..95d45dc 100644
ClassObj theClass = (ClassObj) value;
int count = theClass.getInstanceCount();
-@@ -156,7 +156,7 @@ public class Heap {
+@@ -121,7 +121,7 @@
}
public final void dumpSubclasses() {
@@ -91,7 +85,7 @@ index 3d617e6..95d45dc 100644
ClassObj theClass = (ClassObj) value;
int count = theClass.mSubclasses.size();
-@@ -168,7 +168,7 @@ public class Heap {
+@@ -133,7 +133,7 @@
}
public final void dumpSizes() {
@@ -100,24 +94,20 @@ index 3d617e6..95d45dc 100644
ClassObj theClass = (ClassObj) value;
int size = 0;
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java
-index 80271ab..e4d9767 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java
-@@ -24,7 +24,7 @@ import com.google.common.primitives.UnsignedInts;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/HprofParser.java
+@@ -24,7 +24,7 @@
import java.io.EOFException;
import java.io.IOException;
-import gnu.trove.TLongObjectHashMap;
+import gnu.trove.map.hash.TLongObjectHashMap;
- public class HprofParser {
+ class HprofParser {
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java
-index c481321..b94f1e9 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java
-@@ -21,7 +21,7 @@ import com.android.annotations.NonNull;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/NonRecursiveVisitor.java
+@@ -21,7 +21,7 @@
import java.util.ArrayDeque;
import java.util.Deque;
@@ -126,24 +116,20 @@ index c481321..b94f1e9 100644
/**
* Non-recursive depth-first visitor, managing its own stack.
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java
-index 0b074bf..b216001 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java
-@@ -23,7 +23,7 @@ import com.android.tools.perflib.heap.analysis.ShortestDistanceVisitor;
- import com.android.tools.perflib.heap.analysis.TopologicalSort;
- import com.android.tools.perflib.heap.io.HprofBuffer;
- import com.google.common.collect.ImmutableList;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/Snapshot.java
+@@ -32,7 +32,7 @@
+ import java.util.Collection;
+ import java.util.List;
+
-import gnu.trove.THashSet;
+import gnu.trove.set.hash.THashSet;
-
- import java.util.*;
-
-diff --git a/base/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java b/base/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java
-index 3bcc704..02b08cc 100644
---- a/base/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java
-+++ b/base/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java
-@@ -26,7 +26,7 @@ import com.google.common.collect.Lists;
+ import gnu.trove.TIntObjectHashMap;
+ import gnu.trove.TLongObjectHashMap;
+ import gnu.trove.TObjectProcedure;
+--- a/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java
++++ b/perflib/src/main/java/com/android/tools/perflib/heap/analysis/TopologicalSort.java
+@@ -26,7 +26,7 @@
import java.util.List;
@@ -151,4 +137,4 @@ index 3bcc704..02b08cc 100644
+import gnu.trove.set.hash.TLongHashSet;
public class TopologicalSort {
-
+ @NonNull
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git
More information about the pkg-java-commits
mailing list