Skip to content

Commit 3772c11

Browse files
author
Sigmar Stefansson
committed
update gradle wrapper
1 parent b24f1a5 commit 3772c11

File tree

7 files changed

+186
-163
lines changed

7 files changed

+186
-163
lines changed

‎distann/build.gradle

+18-18
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@ plugins {
55
}
66

77
javafx {
8-
version = '17-ea+3'
8+
version = '17-ea+7'
99
modules = [ 'javafx.base', 'javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.web' ]
1010
}
1111

1212
dependencies {
13-
compile project(':javafasta')
14-
compile project(':serifier')
15-
compile project(':spilling')
13+
implementation project(':javafasta')
14+
implementation project(':serifier')
15+
implementation project(':spilling')
1616

17-
compile group: 'org.apache.poi', name: 'poi', version: '3.17'
18-
compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.17'
19-
compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
20-
compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14'
21-
compile group: 'org.apache.commons', name: 'commons-vfs2', version: '2.2'
22-
//compile group: 'org.gorpipe', name: 'gor-spark', version: '0.5.6'
17+
implementation group: 'org.apache.poi', name: 'poi', version: '3.17'
18+
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '3.17'
19+
implementation group: 'commons-codec', name: 'commons-codec', version: '1.11'
20+
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.14'
21+
implementation group: 'org.apache.commons', name: 'commons-vfs2', version: '2.2'
22+
//implementation group: 'org.gorpipe', name: 'gor-spark', version: '0.5.6'
2323

2424
// https://mvnrepository.com/artifact/org.openjfx/javafx
25-
compile group: 'org.openjfx', name: 'javafx', version: '17-ea+3'
26-
27-
compile "org.openjfx:javafx-base:17-ea+3:mac"
28-
compile "org.openjfx:javafx-controls:17-ea+3:mac"
29-
compile "org.openjfx:javafx-graphics:17-ea+3:mac"
30-
compile "org.openjfx:javafx-fxml:17-ea+3:mac"
31-
compile "org.openjfx:javafx-web:17-ea+3:mac"
32-
compile "org.openjfx:javafx-swing:17-ea+3:mac"
25+
implementation group: 'org.openjfx', name: 'javafx', version: '17-ea+3'
26+
27+
implementation "org.openjfx:javafx-base:17-ea+3:mac"
28+
implementation "org.openjfx:javafx-controls:17-ea+3:mac"
29+
implementation "org.openjfx:javafx-graphics:17-ea+3:mac"
30+
implementation "org.openjfx:javafx-fxml:17-ea+3:mac"
31+
implementation "org.openjfx:javafx-web:17-ea+3:mac"
32+
implementation "org.openjfx:javafx-swing:17-ea+3:mac"
3333

3434
}
3535

‎gradle/wrapper/gradle-wrapper.jar

6.13 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip

‎gradlew

+43-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
3551

36-
warn ( ) {
52+
warn () {
3753
echo "$*"
3854
}
3955

40-
die ( ) {
56+
die () {
4157
echo
4258
echo "$*"
4359
echo
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,32 +156,30 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
160179
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
180+
APP_ARGS=`save "$@"`
163181

164-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165-
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166-
cd "$(dirname "$0")"
167-
fi
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
168184

169-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
185+
exec "$JAVACMD" "$@"

‎serifier/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ plugins {
44
}
55

66
javafx {
7-
version = '17-ea+3'
7+
version = '17-ea+7'
88
modules = ['javafx.base', 'javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.web']
99
}
1010

1111
dependencies {
12-
compile group: 'commons-net', name: 'commons-net', version: '3.7'
13-
compile group: 'org.apache.commons', name: 'commons-vfs2', version: '2.1'
14-
compile group: 'org.apache.spark', name: 'spark-core_2.12', version: '3.1.1'
15-
compile group: 'org.apache.spark', name: 'spark-sql_2.12', version: '3.1.1'
16-
compile group: 'org.apache.spark', name: 'spark-kubernetes_2.12', version: '3.1.1'
17-
compile project(':javafasta')
12+
implementation group: 'commons-net', name: 'commons-net', version: '3.7'
13+
implementation group: 'org.apache.commons', name: 'commons-vfs2', version: '2.1'
14+
implementation group: 'org.apache.spark', name: 'spark-core_2.12', version: '3.1.1'
15+
implementation group: 'org.apache.spark', name: 'spark-sql_2.12', version: '3.1.1'
16+
implementation group: 'org.apache.spark', name: 'spark-kubernetes_2.12', version: '3.1.1'
17+
implementation project(':javafasta')
1818
}

0 commit comments

Comments
 (0)