diff --git a/build.gradle b/build.gradle index cf1920e654aeb76fb4e3d2d28e7021263189e373..00bbb889424d0e7c17b560d7bc8a19973fe50239 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id("java") id("wrapper") - id("com.github.johnrengelman.shadow").version("2.0.4") + id("com.github.johnrengelman.shadow").version("4.0.3") } version = "1.0.1-SNAPSHOT" @@ -14,7 +14,7 @@ version = "1.0.1-SNAPSHOT" final SOURCE_ENCODING = "UTF-8" wrapper { - gradleVersion = "4.9" + gradleVersion = "5.0" distributionType = Wrapper.DistributionType.ALL } @@ -79,7 +79,7 @@ task createKernelSpec(type: JavaExec) { task installKernelSpec(type: Exec) { dependsOn = [createKernelSpec] executable = project.hasProperty("jupyterCommand") ? project.jupyterCommand : "jupyter" - final installFlag + def installFlag if (project.hasProperty("kernelspecUserInstall") && project.kernelspecUserInstall == "true") { installFlag = "--user" } else { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a9516871afd710a9d84d89e31ba77745607bd..457aad0d98108420a977756b7145c93c8910b076 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7dc503f149d00cece495351e1f5b52930f5b7385..ee671127ffa8c0a8fe03ae4a8e43c96d9d236824 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d517fc5249beaefa600691cf150f2fa3e6..af6708ff229fda75da4f7cc4da4747217bac4d53 100755 --- a/gradlew +++ b/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="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index f9553162f122c71b34635112e717c3e733b5b212..6d57edc706c93465988754383a2d7ff353d4e79f 100644 --- a/gradlew.bat +++ b/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= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome