diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 10:37:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 10:37:49 +0000 |
| commit | a660047387888782c23d587344e0c0a06e1702c6 (patch) | |
| tree | 8132d967db4d1f204ea16c56b0dce865ea4f504c | |
| parent | bec1f952f344e48cf0ecb3cf346bba9f3efc25bb (diff) | |
| parent | d1604b71b587e5dbbbadc6a873e9cf079417479e (diff) | |
| download | doclava-a660047387888782c23d587344e0c0a06e1702c6.tar.gz | |
Merge "Remove Java 8 requirement." am: 4cbbfe1325 am: d1604b71b5
Change-Id: Ia73ef87ce0f2677dcc17020ae70467d6e2a3f2fc
| -rw-r--r-- | build.gradle | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle index 3096e0e..e56ffa2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,13 +22,6 @@ apply plugin: 'maven' group = 'com.android' version = '1.0.6' -def currentJvmVersion = org.gradle.api.JavaVersion.current() -if (currentJvmVersion.getMajorVersion() != "8") { - throw new Exception("Unsupported java version '" + currentJvmVersion.toString() + "'. Please install java 8.\n" + -"\n" + -"If you have already installed java 8, you can instruct Gradle to use it by setting the environment variable JAVA_HOME equal to its file path.") -} - /* * With the build server you are given two env variables: * 1. The OUT_DIR is a temporary directory you can use to put things during the build. @@ -85,7 +78,7 @@ dependencies { testCompile 'junit:junit:4.12' // tools.jar required for com.sun.javadoc - compile files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs()) + compile files(System.getProperty('java.home') + "/libs/tools.jar") } sourceSets { |