Skip to content

Commit e03bc68

Browse files
billoneilbilloneil
authored
F/upgrade java (#174)
* Upgrade gradle to 6.7.1 and Java to 15
1 parent 8e29b93 commit e03bc68

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-
apply plugin: 'java'
17+
apply plugin: 'java-library'
1818
apply plugin: 'idea'
1919
apply plugin: 'eclipse'
2020
apply plugin: '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.

‎gradle/wrapper/gradle-wrapper.properties‎

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
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 7 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stubbornjava-cms-server/build.gradle‎

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)