Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade gradle, libs, action #150

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 6 additions & 42 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,10 @@ jobs:
steps:
- name: Prepare git
run: git config --global core.autocrlf false
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '11'
- uses: actions/setup-node@v1
with:
node-version: '12'

- name: Cache Gradle and Node packages
uses: actions/cache@v2
with:
path: |
~/.ivy2/cache
~/.m2
~/.gradle/caches
~/.gradle/wrapper
~/.npm
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-gradle-node-
${{ runner.os }}

- name: build-java (rdflint)
run: ./gradlew build --no-daemon --stacktrace

- name: build-node (vscode-rdflint)
run: |
cd vscode-rdflint
npm ci
npm run compile --if-present

- name: Cleanup Gradle Cache
shell: bash
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties

- uses: actions/upload-artifact@v2
if: always()
with:
name: gradle-reports-${{ runner.os }}
path: build/reports
distribution: 'temurin'
java-version: '21'
- uses: gradle/actions/setup-gradle@v4
- run: ./gradlew build --no-daemon --stacktrace
43 changes: 17 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ plugins {
id 'checkstyle'
id 'pmd'
id 'jacoco'
id 'com.github.johnrengelman.shadow' version '4.0.3'
id 'com.github.spotbugs' version '4.7.0'
id 'com.github.johnrengelman.shadow' version '8.1.1'
// id 'com.github.spotbugs' version '6.0.27'
}
java {
sourceCompatibility = JavaVersion.VERSION_11
Expand All @@ -15,28 +15,28 @@ repositories {
mavenCentral()
}
dependencies {
implementation 'org.apache.jena:jena-arq:4.5.0'
implementation 'commons-cli:commons-cli:1.5.0'
implementation 'org.jline:jline:3.21.0'
implementation 'org.yaml:snakeyaml:1.30'
implementation 'org.codehaus.groovy:groovy:3.0.10'
implementation 'org.slf4j:slf4j-log4j12:1.7.25'
implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.2.2'
implementation 'org.apache.jena:jena-arq:4.7.0'
implementation 'commons-cli:commons-cli:1.9.0'
implementation 'org.jline:jline:3.28.0'
implementation 'org.yaml:snakeyaml:2.3'
implementation 'org.apache.groovy:groovy:4.0.24'
implementation 'org.slf4j:slf4j-log4j12:2.0.16'
implementation 'org.thymeleaf:thymeleaf:3.1.3.RELEASE'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0'
implementation 'org.reflections:reflections:0.10.2'
implementation 'com.github.albfernandez:juniversalchardet:2.3.0'
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.12.0'
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.23.1'
implementation 'org.topbraid:shacl:1.3.0'

compileOnly 'net.jcip:jcip-annotations:1.0'
compileOnly 'com.github.spotbugs:spotbugs:4.7.0'
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.0'
compileOnly 'com.github.spotbugs:spotbugs:4.8.6'
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.8.6'

testImplementation 'junit:junit:4.+'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
testImplementation 'org.mockito:mockito-core:3.1.0'
}
tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
jar {
Expand All @@ -61,9 +61,6 @@ pmd {
"category/java/security.xml"
]
}
spotbugs {
toolVersion = '4.2.1'
}
jacocoTestCoverageVerification {
violationRules {
rule {
Expand All @@ -73,16 +70,10 @@ jacocoTestCoverageVerification {
}
}
}
tasks.withType(Checkstyle) {
reports {
xml.enabled(false)
html.enabled(true)
}
}
tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
checkstyleMain {
reports {
xml.enabled = false
html.enabled = true
xml.required = false
html.required = true
}
}
build.dependsOn jacocoTestReport, jacocoTestCoverageVerification
Expand Down
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-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading