Skip to content

Commit a0b859d

Browse files
authored
Обновление зависимостей и градл (#160)
* Обновление зависимостей и градл * fix precommit task
1 parent a972fc5 commit a0b859d

5 files changed

Lines changed: 24 additions & 25 deletions

File tree

build.gradle.kts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
`java-library`
66
`maven-publish`
77
jacoco
8-
id("org.cadixdev.licenser") version "0.6.1"
8+
id("cloud.rio.license") version "0.18.0"
99
id("me.qoomon.git-versioning") version "6.4.4"
1010
id("io.freefair.lombok") version "9.2.0"
1111
id("io.freefair.javadoc-links") version "9.2.0"
1212
id("io.freefair.javadoc-utf-8") version "9.2.0"
13-
id("io.freefair.maven-central.validate-poms") version "9.2.0"
13+
// id("io.freefair.maven-central.validate-poms") version "9.2.0"
1414
id("com.github.ben-manes.versions") version "0.53.0"
1515
id("ru.vyarus.pom") version "3.0.0"
1616
id("org.jreleaser") version "1.21.0"
@@ -48,24 +48,25 @@ gitVersioning.apply {
4848

4949
dependencies {
5050

51-
implementation("org.apache.commons", "commons-collections4", "4.4")
52-
implementation("io.github.1c-syntax", "utils", "0.6.3")
51+
implementation("org.apache.commons:commons-collections4:4.5.0")
52+
implementation("io.github.1c-syntax:utils:0.6.3")
5353

5454
// логирование
55-
implementation("org.slf4j", "slf4j-api", "2.0.16")
55+
implementation("org.slf4j:slf4j-api:2.0.17")
5656

57-
implementation("org.jspecify", "jspecify", "1.0.0")
57+
implementation("org.jspecify:jspecify:1.0.0")
5858

5959
// логирование
60-
testImplementation("org.slf4j", "slf4j-reload4j", "2.0.16")
60+
testImplementation("org.slf4j:slf4j-reload4j:2.0.17")
6161

6262
// тестирование
63-
testImplementation(platform("org.junit:junit-bom:5.11.4"))
64-
testImplementation("org.junit.jupiter", "junit-jupiter-api")
65-
testImplementation("org.junit.jupiter", "junit-jupiter-params")
66-
testImplementation("org.assertj", "assertj-core", "3.27.0")
67-
testImplementation("com.ginsberg", "junit5-system-exit", "2.0.2")
68-
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine")
63+
testImplementation(platform("org.junit:junit-bom:6.0.3"))
64+
testImplementation("org.junit.jupiter:junit-jupiter-api")
65+
testImplementation("org.junit.jupiter:junit-jupiter-params")
66+
testImplementation("org.assertj:assertj-core:3.27.7")
67+
testImplementation("com.ginsberg:junit5-system-exit:2.0.2")
68+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
69+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
6970
}
7071

7172
java {
@@ -125,13 +126,14 @@ artifacts {
125126
}
126127

127128
license {
128-
header(rootProject.file("license/HEADER.txt"))
129-
newLine(false)
129+
header = rootProject.file("license/HEADER.txt")
130+
skipExistingHeaders = false
131+
strictCheck = true
132+
mapping("java", "SLASHSTAR_STYLE")
130133
ext["year"] = "2021 - " + Calendar.getInstance().get(Calendar.YEAR)
131134
ext["name"] = "Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com>"
132135
ext["project"] = "BSL Common library"
133-
exclude("**/*.properties")
134-
exclude("**/*.orig")
136+
include("**/*.java")
135137
}
136138

137139
publishing {
@@ -197,7 +199,8 @@ tasks.register("precommit") {
197199
description = "Run all precommit tasks"
198200
group = "Developer tools"
199201
dependsOn(":test")
200-
dependsOn(":updateLicenses")
202+
dependsOn(":licenseFormatMain")
203+
dependsOn(":licenseFormatTest")
201204
}
202205

203206
tasks.withType<Javadoc> {

gradle/wrapper/gradle-wrapper.jar

2.35 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)