Upgrade to Gradle 6.3

Also switch to a different Gradle plugin for integrating the Node build
into our Gradle build.
This commit is contained in:
Brian Clozel 2020-04-03 22:06:13 +02:00
parent 1da535dbea
commit c452d33fd8
7 changed files with 46 additions and 11 deletions

View File

@ -266,7 +266,7 @@ You can also publish that artifact to your local maven repository for testing wi
When working on the project, one can run the following command: When working on the project, one can run the following command:
``` ```
$ ./gradlew gulp_dev $ ./gradlew npm_run_dev
``` ```
This will start a local server on `http://localhost:8080`, watch files under `src/**` and rebuild automatically. This will start a local server on `http://localhost:8080`, watch files under `src/**` and rebuild automatically.

View File

@ -1,19 +1,21 @@
plugins { plugins {
id 'distribution' id 'distribution'
id 'maven-publish' id 'maven-publish'
id 'com.moowork.node' version '1.2.0' id 'com.github.node-gradle.node' version '2.2.3'
id "com.moowork.gulp" version '1.2.0'
} }
group = 'io.spring.docresources' group = 'io.spring.docresources'
description = 'Spring Documentation Resources' description = 'Spring Documentation Resources'
node { node {
version = '11.2.0' version = '13.12.0'
npmVersion = '6.4.1' npmVersion = '6.14.4'
download = true download = true
} }
npm_run_build.dependsOn(npm_install)
distZip.dependsOn npm_run_build
distributions { distributions {
main { main {
baseName = 'spring-doc-resources' baseName = 'spring-doc-resources'
@ -31,6 +33,3 @@ publishing {
} }
} }
} }
gulp_default.dependsOn 'npmInstall', 'installGulp'
distZip.dependsOn gulp_default

Binary file not shown.

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

18
gradlew vendored
View File

@ -1,5 +1,21 @@
#!/usr/bin/env sh #!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################## ##############################################################################
## ##
## Gradle start up script for UN*X ## Gradle start up script for UN*X
@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` 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. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"

18
gradlew.bat vendored
View File

@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% 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. @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= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome

View File

@ -11,5 +11,9 @@
"gulp-connect": "^5.6.1", "gulp-connect": "^5.6.1",
"gulp-sass": "^4.0.2", "gulp-sass": "^4.0.2",
"node-sass": "^4.13.1" "node-sass": "^4.13.1"
},
"scripts": {
"build": "gulp",
"dev": "gulp dev"
} }
} }