summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2020-09-29 20:22:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-29 20:22:11 +0000
commit430fc5ab8cbb251c294a9d70af0b810058805f81 (patch)
tree3a932a9c2c6dd36e97b15d2c7549e2780ef6f79e
parent6ec83c725892e17e327e1480c1781a89964b7118 (diff)
parent0d71f158d1d2b3962537af99a9cc435e84db0046 (diff)
downloaddoclava-430fc5ab8cbb251c294a9d70af0b810058805f81.tar.gz
Merge changes I8b0b0ef8,Ib31d5ace am: 0d71f158d1
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1442112 Change-Id: I2c4cd87e0ff85e207eae44531e295cefb603bf8d
-rw-r--r--build.gradle5
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
2 files changed, 6 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index bb0ff5f..08baafb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,3 +126,8 @@ tasks.withType(JavaCompile) {
// Suppress build warnings that we're not interested in: b/154755010
options.warnings = false
}
+
+tasks.withType(Jar) { task ->
+ task.reproducibleFileOrder = true
+ task.preserveFileTimestamps = false
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84939b4..92352a0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=../../../../tools/external/gradle/gradle-3.3-bin.zip
+distributionUrl=../../../../tools/external/gradle/gradle-6.5.1-bin.zip