Skip to content

Commit

Permalink
feat: Use gradle wrapper 5 so tests work for java 8 & 9
Browse files Browse the repository at this point in the history
  • Loading branch information
lili2311 committed Apr 30, 2019
1 parent e7b043f commit e4b99cd
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ before_install:
- curl -s "https://get.sdkman.io" | bash
- source "$HOME/.sdkman/bin/sdkman-init.sh"
- echo sdkman_auto_answer=true > ~/.sdkman/etc/config
after_success:
- travis_terminate 0 # try to make Windows quit
script:
- export GRADLE_OPTS=-Dorg.gradle.daemon=false
- sdk install gradle $GRADLE_VERSION
- jdk_switcher use $JAVA_VERSION
- npm test
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/system/multi-module.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down

0 comments on commit e4b99cd

Please sign in to comment.