Skip to content

Commit

Permalink
Update dependencies and format project (#28)
Browse files Browse the repository at this point in the history
* update dependencies and format project

* revert nemerosa versioning to version that supports jvm 8
  • Loading branch information
LukasForst authored Nov 1, 2022
1 parent e656308 commit 9fda160
Show file tree
Hide file tree
Showing 18 changed files with 120 additions and 114 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ jobs:
strategy:
matrix:
os: [ windows-latest, ubuntu-latest ]
java: [ 8, 11, 17 ]
java: [ 8, 17 ]

steps:
- uses: actions/checkout@v3

- name: Setup JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

- name: Build lib
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8

- name: Build lib
Expand All @@ -30,9 +32,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
server-id: ossrh
server-username: OSSRH_USERNAME
Expand Down
19 changes: 10 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ plugins {
signing
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

// 3.0.0 requires JVM 11, but we want to keep this compatible with JVM 8
id("net.nemerosa.versioning") version "2.15.1"
id("org.jetbrains.dokka") version "1.7.20"
id("io.gitlab.arturbosch.detekt") version "1.19.0"
id("io.gitlab.arturbosch.detekt") version "1.21.0"
}

group = "dev.forst"
Expand All @@ -23,9 +24,11 @@ repositories {
}

dependencies {
val jacksonVersion = "2.13.3"
compileOnly("com.fasterxml.jackson.core", "jackson-databind", jacksonVersion)
compileOnly("com.fasterxml.jackson.module", "jackson-module-kotlin", jacksonVersion)
// compile only detekt plugin
detektPlugins("io.gitlab.arturbosch.detekt", "detekt-formatting", "1.21.0")

compileOnly("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2")
compileOnly("com.fasterxml.jackson.module", "jackson-module-kotlin", "2.13.4")
compileOnly(kotlin("reflect"))
compileOnly(kotlin("stdlib-jdk8"))

Expand All @@ -36,11 +39,9 @@ dependencies {
testImplementation("io.mockk", "mockk", "1.12.3") // mock framework
testImplementation("ch.qos.logback", "logback-classic", "1.2.9") // logging framework for the tests

val junitVersion = "5.8.2"
testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion) // junit testing framework
testImplementation("org.junit.jupiter", "junit-jupiter-params", junitVersion) // generated parameters for tests

testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junitVersion) // testing runtime
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.9.1") // junit testing framework
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.9.1") // generated parameters for tests
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.9.1") // testing runtime
}

detekt {
Expand Down
Loading

0 comments on commit 9fda160

Please sign in to comment.