mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-09-27 10:09:33 +02:00
Gradle 7.2 compatibility
This commit is contained in:
parent
2ac10e7bc7
commit
480df8dac7
|
@ -37,9 +37,13 @@ dependencies {
|
||||||
// implementation "ch.qos.logback:logback-core:1.2.6"
|
// implementation "ch.qos.logback:logback-core:1.2.6"
|
||||||
// We want logback logging in tests and in the app
|
// We want logback logging in tests and in the app
|
||||||
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
||||||
implementation "ch.qos.logback:logback-classic:$logbackVersion"
|
|
||||||
|
|
||||||
implementation(project(":pgpainless-sop"))
|
implementation(project(":pgpainless-sop"))
|
||||||
|
runtimeOnly(project(":pgpainless-sop")) {
|
||||||
|
capabilities {
|
||||||
|
requireCapability("org.pgpainless:pgpainless-sop-logback-support")
|
||||||
|
}
|
||||||
|
}
|
||||||
implementation(project(":sop-java"))
|
implementation(project(":sop-java"))
|
||||||
implementation(project(":sop-java-picocli"))
|
implementation(project(":sop-java-picocli"))
|
||||||
|
|
||||||
|
@ -56,6 +60,8 @@ jar {
|
||||||
attributes 'Main-Class': "$mainClassName"
|
attributes 'Main-Class': "$mainClassName"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||||
|
|
||||||
from {
|
from {
|
||||||
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
|
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
|
||||||
} {
|
} {
|
||||||
|
|
|
@ -6,6 +6,12 @@ plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
registerFeature('logbackSupport') {
|
||||||
|
usingSourceSet(sourceSets.main)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||||
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
|
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
|
||||||
|
@ -14,7 +20,7 @@ dependencies {
|
||||||
// Logging
|
// Logging
|
||||||
api "org.slf4j:slf4j-api:$slf4jVersion"
|
api "org.slf4j:slf4j-api:$slf4jVersion"
|
||||||
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
||||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
logbackSupportApi("ch.qos.logback:logback-classic:$logbackVersion")
|
||||||
|
|
||||||
api "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
|
api "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
|
||||||
api "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
|
api "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
|
||||||
|
|
|
@ -12,13 +12,19 @@ repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
registerFeature('logbackSupport') {
|
||||||
|
usingSourceSet(sourceSets.main)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||||
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
|
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
|
||||||
|
|
||||||
// Logging
|
// Logging
|
||||||
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
||||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
logbackSupportApi("ch.qos.logback:logback-classic:$logbackVersion")
|
||||||
|
|
||||||
implementation(project(":pgpainless-core"))
|
implementation(project(":pgpainless-core"))
|
||||||
implementation(project(":sop-java"))
|
implementation(project(":sop-java"))
|
||||||
|
|
Loading…
Reference in a new issue