Skip to content

Commit 0d51ac1

Browse files
Use Gradle Kotlin DSL (#12)
* Use JSpecify instead of custom annotations. Remove usage of shadowJar due to compatibility issues with JPMS. * Remove lombok as dependency. Migrate to Gradle Kotlin SDL. Use JDK 21.
1 parent 0eb081c commit 0d51ac1

312 files changed

Lines changed: 13607 additions & 10835 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66

77
steps:
88
- uses: actions/checkout@v2
9-
- name: Set up JDK 17
9+
- name: Set up JDK 21
1010
uses: actions/setup-java@v2
1111
with:
12-
java-version: '17'
12+
java-version: '21'
1313
distribution: 'adopt'
1414

1515
- name: Validate Gradle wrapper

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.gradle
22
.idea
3+
.DS_Store
34
build
4-
lib
5+
lib
6+
TODO.md

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
[![Continuous Integration](https://github.com/nicklaswallgren/bankid-java-sdk/workflows/ci/badge.svg)](https://github.com/nicklaswallgren/bankid-java-sdk/actions)
2-
[![License](https://img.shields.io/github/license/nicklaswallgren/bankid-java-sdk)](https://github.com/nicklaswallgren/bankid-java-sdk/blob/master/LICENSE)
3-
[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/NicklasWallgren/bankid-java-sdk.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/NicklasWallgren/bankid-java-sdk/context:java)
1+
[![Continuous Integration](https://github.com/e-identification/bankid-java-sdk/workflows/ci/badge.svg)](https://github.com/e-identification/bankid-java-sdk/actions)
2+
[![License](https://img.shields.io/github/license/e-identification/bankid-java-sdk)](https://github.com/e-identification/bankid-java-sdk/blob/master/LICENSE)
3+
[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/e-identification/bankid-java-sdk.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/e-identification/bankid-java-sdk/context:java)
44

55
# BankID SDK
66

77
SDK to interact with BankID API. It includes support for all the v6.0 features. There are
88
some [examples that may be useful](./examples).
99

1010
## Documentation
11-
See the project's [Javadoc](https://nicklaswallgren.github.io/bankid-java-sdk/).
11+
See the project's [Javadoc](https://e-identification.github.io/bankid-java-sdk/).
1212

1313
## Installation
1414

build.gradle

Lines changed: 0 additions & 46 deletions
This file was deleted.

build.gradle.kts

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
plugins {
2+
id("java")
3+
id("checkstyle-conventions")
4+
id("spotbugs-conventions")
5+
id("errorprone-conventions")
6+
id("test-conventions")
7+
id("publish-conventions")
8+
}
9+
10+
group = "dev.nicklasw"
11+
version = "0.15.0-SNAPSHOT"
12+
13+
java {
14+
sourceCompatibility = JavaVersion.VERSION_21
15+
targetCompatibility = JavaVersion.VERSION_21
16+
}
17+
18+
repositories {
19+
mavenCentral()
20+
}
21+
22+
dependencies {
23+
implementation(libs.jackson.core.databind)
24+
implementation(libs.jspecify)
25+
26+
testImplementation(libs.junit.jupiter.api)
27+
testImplementation(libs.junit.jupiter.params)
28+
testImplementation(libs.mockito.jupiter)
29+
testImplementation(libs.mockito.inline)
30+
31+
testRuntimeOnly(libs.junit.jupiter.engine)
32+
}
33+
34+
java {
35+
withSourcesJar()
36+
withJavadocJar()
37+
}
38+
39+
tasks {
40+
javadoc {
41+
options {
42+
// Suppress the warnings
43+
(this as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet")
44+
}
45+
}
46+
}
47+
48+
tasks.register("code-quality") {
49+
description = "Run Checkstyle, SpotBugs and ErrorProne analysis on both main and test classes"
50+
group = "code-quality"
51+
52+
dependsOn(tasks.named("checkstyle").get())
53+
dependsOn(tasks.named("spotbugs").get())
54+
dependsOn(tasks.named("errorProne").get()) // Only on main classes
55+
}
56+
57+
tasks.register("cq") {
58+
description = "Alias for code-quality"
59+
group = "code-quality"
60+
61+
dependsOn(tasks.named("code-quality").get())
62+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE suppressions PUBLIC
3+
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
4+
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
5+
<suppressions>
6+
<suppress files="SuppressFBWarnings\.java" checks="[a-zA-Z0-9]*"/>
7+
</suppressions>

config/checkstyle/checkstyle.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,4 +281,7 @@
281281
<module name="BeforeExecutionExclusionFileFilter">
282282
<property name="fileNamePattern" value="module\-info\.java$"/>
283283
</module>
284+
<module name="SuppressionFilter">
285+
<property name="file" value="${config_loc}/checkstyle-suppressions.xml" />
286+
</module>
284287
</module>

0 commit comments

Comments
 (0)