Unfork the shadow library for repackaging.
The patch has landed upstream and is part of the latest release.
R=ricow@google.com
Change-Id: I27cbfaa3275eafa0a6c892537991700edc2b3b9f
diff --git a/.gitignore b/.gitignore
index cdc19a1..41e22c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,6 @@
third_party/jdwp-tests
third_party/kotlin.tar.gz
third_party/kotlin
-third_party/shadow
-third_party/shadow.tar.gz
third_party/photos/*
!third_party/photos/*.sha1
third_party/proguard/*
diff --git a/build.gradle b/build.gradle
index ff22c66..f5d54ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,11 +85,7 @@
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.1'
classpath 'com.cookpad.android.licensetools:license-tools-plugin:0.23.0'
- // TODO(ager): shadow does not support java9 class files yet. Once it does,
- // we should use the offial version instead of our fork using ASM 6.0 to
- // support java9.
- // classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
- classpath files("third_party/shadow/shadow-2.0.1.jar")
+ classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
classpath "net.ltgt.gradle:gradle-apt-plugin:0.12"
}
@@ -307,7 +303,6 @@
"jctf",
"kotlin",
"android_cts_baseline",
- "shadow",
"ddmlib",
"core-lambda-stubs",
"openjdk/openjdk-rt-1.8",
diff --git a/third_party/shadow.tar.gz.sha1 b/third_party/shadow.tar.gz.sha1
deleted file mode 100644
index 2dfb69e..0000000
--- a/third_party/shadow.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2e350b99a72aba5d45b018b0f5391130c8751371
\ No newline at end of file
diff --git a/tools/gradle.py b/tools/gradle.py
index 862dd57..ff90779 100755
--- a/tools/gradle.py
+++ b/tools/gradle.py
@@ -16,17 +16,11 @@
GRADLE_SHA1 = os.path.join(GRADLE_DIR, 'gradle.tar.gz.sha1')
GRADLE_TGZ = os.path.join(GRADLE_DIR, 'gradle.tar.gz')
-SHADOW_DIR = os.path.join(utils.REPO_ROOT, 'third_party')
-SHADOW_SHA1 = os.path.join(SHADOW_DIR, 'shadow.tar.gz.sha1')
-SHADOW_TGZ = os.path.join(SHADOW_DIR, 'shadow.tar.gz')
-
if utils.IsWindows():
GRADLE = os.path.join(GRADLE_DIR, 'gradle', 'bin', 'gradle.bat')
else:
GRADLE = os.path.join(GRADLE_DIR, 'gradle', 'bin', 'gradle')
-SHADOW = os.path.join(SHADOW_DIR, 'shadow', 'shadow-2.0.1.jar')
-
def PrintCmd(s):
if type(s) is list:
s = ' '.join(s)
@@ -44,19 +38,8 @@
else:
print 'gradle.py: Gradle binary present'
-def EnsureShadow():
- if not os.path.exists(SHADOW) or os.path.getmtime(SHADOW_TGZ) < os.path.getmtime(SHADOW_SHA1):
- # Bootstrap or update gradle, everything else is controlled using gradle.
- utils.DownloadFromGoogleCloudStorage(SHADOW_SHA1)
- # Update the mtime of the tar file to make sure we do not run again unless
- # there is an update.
- os.utime(SHADOW_TGZ, None)
- else:
- print 'gradle.py: Shadow library present'
-
def EnsureDeps():
EnsureGradle()
- EnsureShadow()
def RunGradleIn(gradleCmd, args, cwd, throw_on_failure=True, env=None):
EnsureDeps()
