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

Commite03bc68

Browse files
authored
F/upgrade java (#174)
* Upgrade gradle to 6.7.1 and Java to 15
1 parent8e29b93 commite03bc68

File tree

12 files changed

+83
-91
lines changed

12 files changed

+83
-91
lines changed

‎.github/workflows/build-stubbornjava-web.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
-name:Set up JDK
6868
uses:actions/setup-java@v1
6969
with:
70-
java-version:1.8
70+
java-version:15
7171

7272
# https://github.com/actions/cache/blob/master/examples.md#java---gradle
7373
-name:save / load Gradle caches

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply from: "gradle/dependencies.gradle"
1414

1515
allprojects {
1616
// Apply the java plugin to add support for Java
17-
applyplugin:'java'
17+
applyplugin:'java-library'
1818
applyplugin:'idea'
1919
applyplugin:'eclipse'
2020
applyplugin:'maven-publish'
@@ -23,8 +23,8 @@ allprojects {
2323
group='com.stubbornjava.StubbornJava'
2424
version='0.0.0-SNAPSHOT'
2525

26-
sourceCompatibility=1.8
27-
targetCompatibility=1.8
26+
sourceCompatibility=15
27+
targetCompatibility=15
2828

2929
sourceSets {
3030
main {
@@ -45,7 +45,7 @@ allprojects {
4545

4646
task copyRuntimeLibs(type:Copy) {
4747
into"build/libs"
48-
from configurations.runtime
48+
from configurations.runtimeClasspath
4949
}
5050

5151
build.finalizedBy(copyRuntimeLibs)

‎gradle/wrapper/gradle-wrapper.jar‎

501 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
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-6.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

‎gradlew.bat‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ 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.
3336
setDEFAULT_JVM_OPTS="-Xmx64m""-Xms64m"
3437

@@ -37,7 +40,7 @@ if defined JAVA_HOME goto 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
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
22
// Project reference
3-
compile project(':stubbornjava-undertow')
4-
compile project(':stubbornjava-common')
5-
3+
api project(':stubbornjava-undertow')
4+
api project(':stubbornjava-common')
5+
66
compileOnly libs.lombok
77
annotationProcessor libs.lombok
8-
9-
testCompile libs.junit
8+
9+
testImplementation libs.junit
1010
}

‎stubbornjava-common/build.gradle‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
// {{start:dependencies}}
22
dependencies {
33
// Project reference
4-
compile project(':stubbornjava-undertow')
5-
compile libs.slf4j
6-
compile libs.logback
7-
compile libs.jacksonCore
8-
compile libs.jacksonDatabind
9-
compile libs.jacksonDatabind
10-
compile libs.jacksonAnnotations
11-
compile libs.jacksonDatatypeJdk8
12-
compile libs.jacksonDatatypeJsr310
13-
compile libs.jacksonDataformatCsv
14-
compile libs.metricsCore
15-
compile libs.metricsJvm
16-
compile libs.metricsJson
17-
compile libs.metricsLogback
18-
compile libs.metricsHealthchecks
19-
compile libs.metricsGraphite
20-
compile libs.guava
21-
compile libs.typesafeConfig
22-
compile libs.handlebars
23-
compile libs.handlebarsJackson
24-
compile libs.handlebarsMarkdown
25-
compile libs.handlebarsHelpers
26-
compile libs.handlebarsHumanize
27-
compile libs.htmlCompressor
28-
compile libs.hikaricp
29-
compile libs.jool
30-
compile libs.okhttp
31-
compile libs.okhttpUrlConnection
32-
compile libs.loggingInterceptor
33-
compile libs.s3
34-
compile libs.failsafe
35-
compile libs.jsoup
36-
compile libs.sitemapgen4j
37-
compile libs.jbcrypt
38-
compile libs.jooq
39-
compile libs.jooqCodegen
40-
compile libs.flyway
41-
compile libs.connectorj
42-
compile libs.javaxAnnotation
43-
4+
api project(':stubbornjava-undertow')
5+
api libs.slf4j
6+
api libs.logback
7+
api libs.jacksonCore
8+
api libs.jacksonDatabind
9+
api libs.jacksonDatabind
10+
api libs.jacksonAnnotations
11+
api libs.jacksonDatatypeJdk8
12+
api libs.jacksonDatatypeJsr310
13+
api libs.jacksonDataformatCsv
14+
api libs.metricsCore
15+
api libs.metricsJvm
16+
api libs.metricsJson
17+
api libs.metricsLogback
18+
api libs.metricsHealthchecks
19+
api libs.metricsGraphite
20+
api libs.guava
21+
api libs.typesafeConfig
22+
api libs.handlebars
23+
api libs.handlebarsJackson
24+
api libs.handlebarsMarkdown
25+
api libs.handlebarsHelpers
26+
api libs.handlebarsHumanize
27+
api libs.htmlCompressor
28+
api libs.hikaricp
29+
api libs.jool
30+
api libs.okhttp
31+
api libs.okhttpUrlConnection
32+
api libs.loggingInterceptor
33+
api libs.s3
34+
api libs.failsafe
35+
api libs.jsoup
36+
api libs.sitemapgen4j
37+
api libs.jbcrypt
38+
api libs.jooq
39+
api libs.jooqCodegen
40+
api libs.flyway
41+
api libs.connectorj
42+
api libs.javaxAnnotation
43+
4444
compileOnly libs.lombok
4545
annotationProcessor libs.lombok
46-
47-
testCompile libs.junit
48-
testCompile libs.hsqldb
46+
47+
testImplementation libs.junit
48+
testImplementation libs.hsqldb
4949
}
5050
// {{end:dependencies}}

‎stubbornjava-examples/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// {{start:dependencies}}
22
dependencies {
3-
compile project(':stubbornjava-undertow')
4-
compile project(':stubbornjava-common')
5-
compile libs.hsqldb
6-
compile libs.hashids
7-
testCompile libs.junit
3+
implementation project(':stubbornjava-undertow')
4+
implementation project(':stubbornjava-common')
5+
implementation libs.hsqldb
6+
implementation libs.hashids
7+
testImplementation libs.junit
88
}
99
// {{end:dependencies}}

‎stubbornjava-undertow/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// {{start:dependencies}}
22
dependencies {
3-
compile libs.undertowCore
4-
compile libs.slf4j
5-
compile libs.logback
3+
api libs.undertowCore
4+
api libs.slf4j
5+
api libs.logback
66

7-
testCompile libs.junit
7+
testImplementation libs.junit
88
}
99
// {{end:dependencies}}

0 commit comments

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