Skip to content

Commit

Permalink
update logback to 1.2.10, update ci use jdk17, update gradle to 7.3.3
Browse files Browse the repository at this point in the history
proper access of archiveFileName property
  • Loading branch information
ancho committed Dec 26, 2021
1 parent 630f471 commit 4d95b42
Show file tree
Hide file tree
Showing 10 changed files with 169 additions and 119 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ script:
- "./gradlew check --stacktrace"

jdk:
- openjdk15
- openjdk17
- openjdk11

jobs:
include:

- jdk: openjdk15
- jdk: openjdk17
os: osx

- jdk: openjdk11
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ clone_depth: 10
environment:
TERM: dumb
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files\Java\jdk11
- JAVA_HOME: C:\Program Files\Java\jdk15
- JAVA_HOME: C:\Program Files\Java\jdk17

install:
- SET PATH=%JAVA_HOME%\bin;%PATH%
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ allprojects {

tasks.withType(Checkstyle) {
reports {
xml.enabled false
html.enabled true
xml.required.set(false)
html.required.set(true)
}
}

Expand Down Expand Up @@ -148,8 +148,8 @@ subprojects {

jacocoTestReport {
reports {
xml.enabled = true // coveralls plugin depends on xml format report
html.enabled = true
xml.required.set(true) // coveralls plugin depends on xml format report
html.required.set(true)
}
}

Expand All @@ -171,8 +171,8 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
executionData.from jacocoMerge.executionData

reports {
html.enabled = true
xml.enabled = true
html.required.set(true)
xml.required.set(true)
}
}

Expand Down
1 change: 1 addition & 0 deletions buildSrc/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name='jbake-conventions'
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jsonSimpleVersion = 1.1.1
jade4jVersion = 1.3.2
jsoupVersion = 1.14.3
jgitVersion = 6.0.0.202111291000-r
logbackVersion = 1.2.8
logbackVersion = 1.2.10
orientDbVersion = 3.0.41
pebbleVersion = 3.1.5
slf4jVersion = 1.7.32
Expand All @@ -38,10 +38,10 @@ junit5Version = 5.8.2
junit5SystemExtVersion = 1.2.0
junitPioneer = 1.5.0
assertjCoreVersion = 3.21.0
mockitoVersion = 4.1.0
mockitoVersion = 4.2.0

# build dependencies
jacocoVersion = 0.8.6
jacocoVersion = 0.8.7
grgitVersion = 4.1.1

org.gradle.caching=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/github-releases.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rootProject.ext {
}

afterEvaluate {
def name = project(':jbake-dist').tasks.getByName("distZip").archiveName
def name = project(':jbake-dist').tasks.getByName("distZip").archiveFileName.getOrNull()
def files = project(':jbake-dist').tasks.getByName("distZip").outputs.files.files
if (!project.hasProperty('skipSigning')) {
def signatureFile = project(':jbake-dist').tasks.getByName("signArchives").outputs.files.files.find { it.name.contains(name) }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4d95b42

Please sign in to comment.