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

upgradle dependencies #27

Merged
merged 10 commits into from
Oct 7, 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
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[*.{kt,kts}]
indent_size = 2
max_line_length = 180
disabled_rules=import-ordering
ktlint_standard_function-signature = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
ktlint_standard_string-template-indent = disabled
ktlint_standard_multiline-expression-wrapping = disabled
22 changes: 5 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,12 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.8
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('build.gradle.kts') }}
restore-keys: |
${{ runner.os }}-gradle-caches-
- name: Cache wrapper
uses: actions/cache@v2
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-wrapper-
java-version: 11
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build
run: ./gradlew build
4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v3
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 11
- name: Check version not snapshot
run: |
PROJECT_VERSION=$(./gradlew -q printVersion | tail -n 1)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 11
- name: Check version is snapshot
run: |
PROJECT_VERSION=$(./gradlew -q printVersion | tail -n 1)
Expand Down
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

JSON Content Validator (JCV) allows you to compare JSON contents with embedded validation.

[![Build Status](https://github.com/ekino/jcv/workflows/Build%20branch/badge.svg?branch=master)](https://github.com/ekino/jcv/actions?query=workflow%3A%22Build+branch%22+branch%3Amaster)
[![Build](https://github.com/ekino/jcv/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/ekino/jcv/actions/workflows/build.yml)
[![GitHub (pre-)release](https://img.shields.io/github/release/ekino/jcv/all.svg)](https://github.com/ekino/jcv/releases)
[![Maven Central](https://img.shields.io/maven-central/v/com.ekino.oss.jcv/jcv-core)](https://search.maven.org/search?q=g:com.ekino.oss.jcv)
[![GitHub license](https://img.shields.io/github/license/ekino/jcv.svg)](https://github.com/ekino/jcv/blob/master/LICENSE.md)
Expand All @@ -17,7 +17,7 @@ JSON Content Validator (JCV) allows you to compare JSON contents with embedded v
* [AssertJ module](#assertj-module)
* [Hamcrest module](#hamcrest-module)
* [WireMock module](#wiremock-module)
* [Validators](#validators)
* [Learn more](#learn-more)


## Summary
Expand Down Expand Up @@ -80,7 +80,7 @@ Maven
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -97,7 +97,7 @@ Gradle
```groovy
dependencies {
...
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'com.ekino.oss.jcv:jcv-core:1.6.0-SNAPSHOT'
...
}
Expand Down Expand Up @@ -160,13 +160,13 @@ Maven
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.9.1</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -183,8 +183,8 @@ Gradle
```groovy
dependencies {
...
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
testImplementation 'org.assertj:assertj-core:3.9.1'
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'com.ekino.oss.jcv:jcv-assertj:1.6.0-SNAPSHOT'
...
}
Expand Down Expand Up @@ -218,13 +218,13 @@ Maven
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.1</version>
<version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -241,8 +241,8 @@ Gradle
```groovy
dependencies {
...
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
testImplementation 'org.hamcrest:hamcrest:2.1'
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'org.hamcrest:hamcrest:3.0'
testImplementation 'com.ekino.oss.jcv:jcv-hamcrest:1.6.0-SNAPSHOT'
...
}
Expand Down Expand Up @@ -330,13 +330,13 @@ Maven
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.27.2</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -353,8 +353,8 @@ Gradle
```groovy
dependencies {
...
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'org.wiremock:wiremock:3.9.1'
testImplementation 'com.ekino.oss.jcv:jcv-wiremock:1.6.0-SNAPSHOT'
...
}
Expand Down
83 changes: 43 additions & 40 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,77 @@ import se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask

plugins {
base
kotlin("jvm") version "1.4.10" apply false
id("com.ekino.oss.plugin.kotlin-quality") version "2.0.0" apply false
id("net.researchgate.release") version "2.8.1"
id("se.bjurr.gitchangelog.git-changelog-gradle-plugin") version "1.64"
id("org.jetbrains.dokka") version "1.4.0-rc"
`maven-publish`
signing
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.ktlint) apply false
alias(libs.plugins.detekt)
alias(libs.plugins.release)
alias(libs.plugins.changelog)
alias(libs.plugins.dokka)
}

allprojects {
group = "com.ekino.oss.jcv"

repositories {
mavenCentral()
jcenter()
}

registerProperties(
"kotlin.version" to "1.4.10",
"commons-io.version" to "2.7",
"jsonassert.version" to "1.5.0",
"assertj.version" to "3.16.1",
"hamcrest.version" to "2.2",
"junit-jupiter.version" to "5.6.2",
"assertk-jvm.version" to "0.22",
"wiremock.version" to "2.27.2"
)
}

tasks.create("printVersion") {
doLast {
val version: String by project
println(version)
tasks {
register("printVersion") {
doLast {
println(project.version.toString())
}
}

register<GitChangelogTask>("gitChangelogTask") {
file = File("CHANGELOG.md")
templateContent = file("template_changelog.mustache").readText()
}
}

tasks.create<GitChangelogTask>("gitChangelogTask") {
file = File("CHANGELOG.md")
templateContent = file("template_changelog.mustache").readText()
detekt {
buildUponDefaultConfig = true
config.setFrom("config/detekt.yml")
}

subprojects {

apply<MavenPublishPlugin>()
apply<ReleasePlugin>()
apply<SigningPlugin>()

configure<PublishingExtension> {
publishing {
publications {
create<MavenPublication>("mavenJava") {
register<MavenPublication>("mavenJava") {
pom {
name.set("JCV")
description.set("JSON Content Validator (JCV) allows you to compare JSON contents with embedded validation.")
url.set("https://github.com/ekino/jcv")
name = "JCV"
description = "JSON Content Validator (JCV) allows you to compare JSON contents with embedded validation."
url = "https://github.com/ekino/jcv"
licenses {
license {
name.set("MIT License (MIT)")
url.set("https://opensource.org/licenses/mit-license")
name = "MIT License (MIT)"
url = "https://opensource.org/licenses/mit-license"
}
}
developers {
developer {
name.set("Léo Millon")
email.set("[email protected]")
organization.set("ekino")
organizationUrl.set("https://www.ekino.com/")
name = "Léo Millon"
email = "[email protected]"
organization = "ekino"
organizationUrl = "https://www.ekino.com/"
}
}
scm {
connection.set("scm:git:git://github.com/ekino/jcv.git")
developerConnection.set("scm:git:ssh://github.com:ekino/jcv.git")
url.set("https://github.com/ekino/jcv")
connection = "scm:git:git://github.com/ekino/jcv.git"
developerConnection = "scm:git:ssh://github.com:ekino/jcv.git"
url = "https://github.com/ekino/jcv"
}
organization {
name.set("ekino")
url.set("https://www.ekino.com/")
name = "ekino"
url = "https://www.ekino.com/"
}
}
repositories {
Expand All @@ -95,4 +93,9 @@ subprojects {
}
}
}

signing {
setRequired { gradle.taskGraph.hasTask("publish") }
sign(publishing.publications["mavenJava"])
}
}
Loading