Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc812daa

Browse files
authored
Update gradle, make compilable with jdk17 (#813)
1 parent72f1375 commitc812daa

File tree

5 files changed

+27
-43
lines changed

5 files changed

+27
-43
lines changed

‎build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ plugins {
1818
version='2.7.0-SNAPSHOT'
1919

2020
repositories {
21-
jcenter()
2221
mavenCentral()
2322
maven { url"https://jitpack.io" }
2423
}
@@ -84,7 +83,7 @@ test.testLogging {
8483
//Coverage
8584
jacoco {
8685
toolVersion="0.8.2"
87-
reportsDir= file("$buildDir/customJacocoReportDir")
86+
reportsDirectory= file("$buildDir/customJacocoReportDir")
8887
}
8988

9089
jacocoTestReport {
@@ -118,7 +117,7 @@ test.finalizedBy jacocoTestCoverageVerification
118117

119118
//Jar
120119
jar {
121-
baseName="${rootProject.name}"
120+
archiveBaseName="${rootProject.name}"
122121
manifest {
123122
from file("${projectDir}/src/main/resources/META-INF/MANIFEST.MF")
124123
}

‎gradle/wrapper/gradle-wrapper.jar‎

3.5 KB
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Dec 02 19:24:34 CET 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ APP_NAME="Gradle"
4444
APP_BASE_NAME=`basename"$0"`
4545

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

4949
# Use the maximum available, or set MAX_FD != -1 to use that value.
5050
MAX_FD="maximum"
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [-n"$JAVA_HOME" ];then
8788
if [-x"$JAVA_HOME/jre/sh/java" ];then
@@ -129,6 +130,7 @@ fi
129130
if ["$cygwin"="true"-o"$msys"="true" ];then
130131
APP_HOME=`cygpath --path --mixed"$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed"$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix"$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154156
else
155157
eval`echo args$i`="\"$arg\""
156158
fi
157-
i=$((i+1))
159+
i=`expr$i + 1`
158160
done
159161
case$iin
160-
(0)set -- ;;
161-
(1)set --"$args0" ;;
162-
(2)set --"$args0""$args1" ;;
163-
(3)set --"$args0""$args1""$args2" ;;
164-
(4)set --"$args0""$args1""$args2""$args3" ;;
165-
(5)set --"$args0""$args1""$args2""$args3""$args4" ;;
166-
(6)set --"$args0""$args1""$args2""$args3""$args4""$args5" ;;
167-
(7)set --"$args0""$args1""$args2""$args3""$args4""$args5""$args6" ;;
168-
(8)set --"$args0""$args1""$args2""$args3""$args4""$args5""$args6""$args7" ;;
169-
(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" ;;
170172
esac
171173
fi
172174

@@ -175,14 +177,9 @@ save () {
175177
for idoprintf %s\\n"$i"| sed"s/'/'\\\\''/g;1s/^/'/;\$s/\$/'\\\\/";done
176178
echo""
177179
}
178-
APP_ARGS=$(save"$@")
180+
APP_ARGS=`save"$@"`
179181

180182
# Collect all arguments for the java command, following the shell quoting and substitution rules
181183
evalset --$DEFAULT_JVM_OPTS$JAVA_OPTS$GRADLE_OPTS"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath"\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain"$APP_ARGS"
182184

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if ["$(uname)"="Darwin" ]&& ["$HOME"="$PWD" ];then
185-
cd"$(dirname"$0")"
186-
fi
187-
188185
exec"$JAVACMD""$@"

‎gradlew.bat‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
setAPP_BASE_NAME=%~n0
3030
setAPP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for%%iin ("%APP_HOME%")dosetAPP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
setDEFAULT_JVM_OPTS=""
36+
setDEFAULT_JVM_OPTS="-Xmx64m""-Xms64m"
3437

3538
@rem Find java.exe
3639
ifdefined JAVA_HOMEgoto findJavaFromJavaHome
3740

3841
setJAVA_EXE=java.exe
3942
%JAVA_EXE% -version>NUL2>&1
40-
if"%ERRORLEVEL%"=="0"gotoinit
43+
if"%ERRORLEVEL%"=="0"gotoexecute
4144

4245
echo.
4346
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
5154
setJAVA_HOME=%JAVA_HOME:"=%
5255
setJAVA_EXE=%JAVA_HOME%/bin/java.exe
5356

54-
ifexist"%JAVA_EXE%"gotoinit
57+
ifexist"%JAVA_EXE%"gotoexecute
5558

5659
echo.
5760
echo ERROR: JAVA_HOME is set to an invalid directory:%JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
6164

6265
goto fail
6366

64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
ifnot"%OS%"=="Windows_NT"goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
setCMD_LINE_ARGS=
72-
set_SKIP=2
73-
74-
:win9xME_args_slurp
75-
if"x%~1"=="x"goto execute
76-
77-
setCMD_LINE_ARGS=%*
78-
7967
:execute
8068
@rem Setup the command line
8169

8270
setCLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8371

72+
8473
@rem Execute Gradle
85-
"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath"%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain%CMD_LINE_ARGS%
74+
"%JAVA_EXE%"%DEFAULT_JVM_OPTS%%JAVA_OPTS%%GRADLE_OPTS%"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath"%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain%*
8675

8776
:end
8877
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp