commit cd06c8075e454ee224cba6dd3d49a44a737d61f6
author Mads Ager <ager@google.com> Tue Aug 22 13:44:34 2017 +0200
committer Mads Ager <ager@google.com> Tue Aug 22 13:44:34 2017 +0200
tree 66ec6161b9d00a267302583c4e3f9dc836913a4e
parent 91aa3186c9b7f5f54fb06839b86e636f941d22bc

Use a version of json-simple that does not pull in junit and hamcrest.

We ended up packaging junit and hamcrest in our jar for no reason.
The dependency is coming from json-simple. Going to version
1.1 instead of 1.1.1 removes the dependency.

Additionally, always use org.junit and not junit.framework.

R=herhut@google.com

Bug:
Change-Id: I4fdc214d0cbf73d50af94acb1116e4688019e52b

build.gradle

diff --git a/build.gradle b/build.gradle
index 78e7e94..63513ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,7 +114,7 @@
 
 dependencies {
     compile 'net.sf.jopt-simple:jopt-simple:4.6'
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'com.googlecode.json-simple:json-simple:1.1'
     compile group: 'com.google.guava', name: 'guava', version: '19.0'
     compile group: 'it.unimi.dsi', name: 'fastutil', version: '7.2.0'
     compile group: 'org.apache.commons', name: 'commons-compress', version: '1.12'
@@ -333,11 +333,8 @@
         relocate 'joptsimple', 'com.android.tools.r8.joptsimple'
         relocate 'org.apache.commons', 'com.android.tools.r8.org.apache.commons'
         relocate 'org.objectweb.asm', 'com.android.tools.r8.org.objectweb.asm'
-        relocate 'org.junit', 'com.android.tools.r8.org.junit'
-        relocate 'org.hamcrest', 'com.android.tools.r8.org.hamcrest'
         relocate 'org.json.simple', 'com.android.tools.r8.org.json.simple'
         relocate 'it.unimi.dsi.fastutil', 'com.android.tools.r8.it.unimi.dsi.fastutil'
-        relocate 'junit', 'com.android.tools.r8.junit'
         // Also include dependencies
         configurations = [project.configurations.compile]
     }
@@ -361,11 +358,8 @@
         relocate 'joptsimple', 'com.android.tools.r8.joptsimple'
         relocate 'org.apache.commons', 'com.android.tools.r8.org.apache.commons'
         relocate 'org.objectweb.asm', 'com.android.tools.r8.org.objectweb.asm'
-        relocate 'org.junit', 'com.android.tools.r8.org.junit'
-        relocate 'org.hamcrest', 'com.android.tools.r8.org.hamcrest'
         relocate 'org.json.simple', 'com.android.tools.r8.org.json.simple'
         relocate 'it.unimi.dsi.fastutil', 'com.android.tools.r8.it.unimi.dsi.fastutil'
-        relocate 'junit', 'com.android.tools.r8.junit'
         // Also include dependencies
         configurations = [project.configurations.compile]
     }