Merge pull request #64 from snyk/feat/test-java-9

Feat/test java 9
snyk · Apr 30, 2019 · 63e8a8a · 63e8a8a
2 parents 0c29667 + e4b99cd
commit 63e8a8a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,16 +6,20 @@ notifications:
 language: node_js
 jdk:
   - openjdk8
+  - oraclejdk9
 node_js:
   - "10"
   - "8"
   - "6"
 env:
   - GRADLE_VERSION=3.5.1 JAVA_VERSION=openjdk8
+  # java 9 and gradle 3 not supported
 
   - GRADLE_VERSION=4.10.3 JAVA_VERSION=openjdk8
+  - GRADLE_VERSION=4.10.3 JAVA_VERSION=oraclejdk9
 
   - GRADLE_VERSION=5.3.1 JAVA_VERSION=openjdk8
+  - GRADLE_VERSION=5.3.1 JAVA_VERSION=oraclejdk9
 
 cache:
   directories:

diff --git a/test/fixtures/multi-project-gradle-3/gradle/wrapper/gradle-wrapper.jar b/test/fixtures/multi-project-gradle-3/gradle/wrapper/gradle-wrapper.jar
diff --git a/...tures/multi-project-gradle-3/build.gradle → ...multi-project-gradle-wrapper/build.gradle b/...tures/multi-project-gradle-3/build.gradle → ...multi-project-gradle-wrapper/build.gradle
diff --git a/test/fixtures/multi-project-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/test/fixtures/multi-project-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/fixtures/multi-project-gradle-3/gradlew → ...ures/multi-project-gradle-wrapper/gradlew b/test/fixtures/multi-project-gradle-3/gradlew → ...ures/multi-project-gradle-wrapper/gradlew
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/...xtures/multi-project-gradle-3/gradlew.bat → .../multi-project-gradle-wrapper/gradlew.bat b/...xtures/multi-project-gradle-3/gradlew.bat → .../multi-project-gradle-wrapper/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/...es/multi-project-gradle-3/settings.gradle → ...ti-project-gradle-wrapper/settings.gradle b/...es/multi-project-gradle-3/settings.gradle → ...ti-project-gradle-wrapper/settings.gradle
diff --git a/...lti-project-gradle-3/subproj/build.gradle → ...oject-gradle-wrapper/subproj/build.gradle b/...lti-project-gradle-3/subproj/build.gradle → ...oject-gradle-wrapper/subproj/build.gradle
diff --git a/test/system/multi-module.test.ts b/test/system/multi-module.test.ts
@@ -86,12 +86,12 @@ test('multi-project: only sub-project has deps, none returned for main', async (
   t.notOk(result.package.dependencies);
 });
 
-test('multi-project: using gradle 3.0.0 via wrapper', async (t) => {
+test('multi-project: using gradle via wrapper', async (t) => {
   const result = await inspect('.',
-    path.join(fixtureDir('multi-project-gradle-3'), 'build.gradle'));
+    path.join(fixtureDir('multi-project-gradle-wrapper'), 'build.gradle'));
   t.match(result.package.name, '.',
     'returned project name is not sub-project');
-    t.deepEqual(result.plugin.meta!.allDepRootNames, ['root-proj', 'subproj']);
+  t.deepEqual(result.plugin.meta!.allDepRootNames, ['root-proj', 'subproj']);
   t.notOk(result.package.dependencies);
 });