diff --git a/ant.json b/ant.json index 5582cec904..fe65a6baa1 100644 --- a/ant.json +++ b/ant.json @@ -9,7 +9,9 @@ "env_set": { "ANT_HOME": "$dir" }, - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "url": "https://ant.apache.org/bindownload.cgi", "re": "Currently, Apache Ant (?:[\\d.]+ and )?([\\d.]+) (?:is|are) the best" diff --git a/bfg.json b/bfg.json index a02b49489b..ee3014300e 100644 --- a/bfg.json +++ b/bfg.json @@ -4,7 +4,9 @@ "version": "1.12.15", "url": "https://repo1.maven.org/maven2/com/madgag/bfg/1.12.15/bfg-1.12.15.jar", "hash": "330af214a0fed320c591afc1046b0f31e8a438f290da09672973aeaa6411b09d", - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "bin": "bfg.ps1", "env_set": { "BFG_HOME": "$dir" diff --git a/gradle.json b/gradle.json index a82cc8602c..9930155787 100644 --- a/gradle.json +++ b/gradle.json @@ -6,7 +6,9 @@ "url": "https://services.gradle.org/distributions/gradle-3.3-bin.zip", "extract_dir": "gradle-3.3", "bin": "bin\\gradle.bat", - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "url": "https://gradle.org/gradle-download/", "re": "The current Gradle release is version ([\\d.]+)" diff --git a/grails.json b/grails.json index c1acf14c3e..9719c002b3 100644 --- a/grails.json +++ b/grails.json @@ -11,7 +11,9 @@ "env_set": { "GRAILS_HOME": "$dir" }, - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "github": "https://github.com/grails/grails-core" }, diff --git a/groovy.json b/groovy.json index 4bb732fa0a..ae5eab3228 100644 --- a/groovy.json +++ b/groovy.json @@ -18,7 +18,9 @@ "env_set": { "GROOVY_HOME": "$dir" }, - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "url": "http://www.groovy-lang.org/download.html", "re": "([\\d.]+) distributions" diff --git a/kotlin.json b/kotlin.json index c26528a7a0..d38af160f2 100644 --- a/kotlin.json +++ b/kotlin.json @@ -14,7 +14,9 @@ "env_set": { "KOTLIN_HOME": "$dir" }, - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "github": "https://github.com/JetBrains/kotlin" }, diff --git a/maven.json b/maven.json index 69bbcb67a3..91d503e0ca 100644 --- a/maven.json +++ b/maven.json @@ -11,7 +11,9 @@ "env_set": { "M2_HOME": "$dir" }, - "notes": "Maven requires a JDK such as OpenJDK 7 (scoop install openjdk) or Oracle's Java 8 (scoop install oraclejdk). The Oracle JDK requires the Scoop Extras bucket (scoop butcket add extras).", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "url": "https://maven.apache.org/download.cgi", "re": "Apache Maven ([\\d.]+) is the latest release" diff --git a/scala.json b/scala.json index 76bfd63bc6..44e5cb75bd 100644 --- a/scala.json +++ b/scala.json @@ -15,7 +15,9 @@ "env_set": { "SCALA_HOME": "$dir" }, - "depends": "openjdk", + "suggest": { + "JDK": [ "extras/oraclejdk", "openjdk" ] + }, "checkver": { "url": "https://www.scala-lang.org/download/", "re": "Download Scala ([\\d.]+)" diff --git a/scholdoc.json b/scholdoc.json index 6790f91eb7..688cdaf072 100644 --- a/scholdoc.json +++ b/scholdoc.json @@ -3,7 +3,6 @@ "license": "", "extract_dir": "Scholdoc", "url": "http://scholarlymarkdown.com/scholdoc-distribution/windows/scholdoc-0.1.3-alpha-windows.msi", - "depends": "", "homepage": "http://scholdoc.scholarlymarkdown.com/", "hash": "e58036686c3c05db4a50d5fabd875eaa33aff2b0dd4d930c6bc2067c2bcd2b86", "bin": "scholdoc.exe", diff --git a/yarn.json b/yarn.json index 53de5c97ac..956bc86911 100644 --- a/yarn.json +++ b/yarn.json @@ -2,7 +2,9 @@ "homepage": "https://yarnpkg.com/", "license": "BSD", "version": "0.19.1", - "depends": "nodejs", + "suggest": { + "Node.js": [ "nodejs" ] + }, "url": "https://github.com/yarnpkg/yarn/releases/download/v0.19.1/yarn-0.19.1.msi", "hash": "2d08c4e4e7a6086585ef47307333187a235aa926a211628d3f8c02093fd6fb71", "bin": "Yarn\\bin\\yarn.cmd",