From a254cfc84116231788e6c0b7bcb5f907dc78073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20von=20der=20Gr=C3=BCn?= Date: Wed, 13 Jun 2018 16:09:04 +0200 Subject: [PATCH] Fix Java tests for older Gradle versions Before this, Gradle 4.4 was required to build the Gradle wrapper and thus run the Java tests. This was because of all the stuff that had to be configured when running the wrapper task using the build.gradle file. Now we use a config file that only specifies the required Gradle version and nothing else to run the wrapper task. This allows tests to be run with Gradle versions beginning with 2. --- test/run_java_unit_tests.js | 2 +- test/wrapper.gradle | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 test/wrapper.gradle diff --git a/test/run_java_unit_tests.js b/test/run_java_unit_tests.js index f26641c1..a4c9c165 100644 --- a/test/run_java_unit_tests.js +++ b/test/run_java_unit_tests.js @@ -26,7 +26,7 @@ var superspawn = require('cordova-common').superspawn; // First we make sure the gradlew helper file is built and ready. var GradleBuilder = require('../bin/templates/cordova/lib/builders/GradleBuilder'); var builder = new GradleBuilder(__dirname); -var needs_gradlew_built = builder.runGradleWrapper('gradle', 'build.gradle'); +var needs_gradlew_built = builder.runGradleWrapper('gradle'); if (!needs_gradlew_built) { // Due to interface of gradle builder, if the gradlew file already exists, `runGradleWrapper` returns undefined. diff --git a/test/wrapper.gradle b/test/wrapper.gradle new file mode 100644 index 00000000..11514912 --- /dev/null +++ b/test/wrapper.gradle @@ -0,0 +1,3 @@ +wrapper { + gradleVersion = '4.4.1' +}