mirror of
https://codeberg.org/PGPainless/cert-d-java.git
synced 2025-12-05 04:41:08 +01:00
Upgrade build system
This commit is contained in:
parent
e4128a002a
commit
a0758c5541
6 changed files with 13 additions and 48 deletions
23
build.gradle
23
build.gradle
|
|
@ -17,10 +17,6 @@ buildscript {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id 'ru.vyarus.animalsniffer' version '1.5.3'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: 'version.gradle'
|
apply from: 'version.gradle'
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
|
|
@ -39,7 +35,7 @@ allprojects {
|
||||||
|
|
||||||
// checkstyle
|
// checkstyle
|
||||||
checkstyle {
|
checkstyle {
|
||||||
toolVersion = '8.18'
|
toolVersion = '10.26.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
group 'org.pgpainless'
|
group 'org.pgpainless'
|
||||||
|
|
@ -65,8 +61,7 @@ allprojects {
|
||||||
isReleaseVersion = !isSnapshot
|
isReleaseVersion = !isSnapshot
|
||||||
signingRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
|
signingRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
|
||||||
sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
|
sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
|
||||||
sonatypeSnapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
|
sonatypeStagingUrl = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'
|
||||||
sonatypeStagingUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSnapshot) {
|
if (isSnapshot) {
|
||||||
|
|
@ -83,7 +78,7 @@ allprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
jacoco {
|
jacoco {
|
||||||
toolVersion = "0.8.7"
|
toolVersion = "0.8.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
jacocoTestReport {
|
jacocoTestReport {
|
||||||
|
|
@ -91,7 +86,7 @@ allprojects {
|
||||||
sourceDirectories.setFrom(project.files(sourceSets.main.allSource.srcDirs))
|
sourceDirectories.setFrom(project.files(sourceSets.main.allSource.srcDirs))
|
||||||
classDirectories.setFrom(project.files(sourceSets.main.output))
|
classDirectories.setFrom(project.files(sourceSets.main.output))
|
||||||
reports {
|
reports {
|
||||||
xml.enabled true
|
xml.required = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -109,15 +104,15 @@ subprojects {
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
classifier = 'sources'
|
archiveClassifier = 'sources'
|
||||||
from sourceSets.main.allSource
|
from sourceSets.main.allSource
|
||||||
}
|
}
|
||||||
task javadocJar(type: Jar, dependsOn: javadoc) {
|
task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||||
classifier = 'javadoc'
|
archiveClassifier = 'javadoc'
|
||||||
from javadoc.destinationDir
|
from javadoc.destinationDir
|
||||||
}
|
}
|
||||||
task testsJar(type: Jar, dependsOn: testClasses) {
|
task testsJar(type: Jar, dependsOn: testClasses) {
|
||||||
classifier = 'tests'
|
archiveClassifier = 'tests'
|
||||||
from sourceSets.test.output
|
from sourceSets.test.output
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -161,7 +156,7 @@ subprojects {
|
||||||
repositories {
|
repositories {
|
||||||
if (sonatypeCredentialsAvailable) {
|
if (sonatypeCredentialsAvailable) {
|
||||||
maven {
|
maven {
|
||||||
url isSnapshot ? sonatypeSnapshotUrl : sonatypeStagingUrl
|
url sonatypeStagingUrl
|
||||||
credentials {
|
credentials {
|
||||||
username = sonatypeUsername
|
username = sonatypeUsername
|
||||||
password = sonatypePassword
|
password = sonatypePassword
|
||||||
|
|
@ -214,7 +209,7 @@ task jacocoRootReport(type: JacocoReport) {
|
||||||
classDirectories.setFrom(files(subprojects.sourceSets.main.output))
|
classDirectories.setFrom(files(subprojects.sourceSets.main.output))
|
||||||
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
|
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
|
||||||
reports {
|
reports {
|
||||||
xml.enabled true
|
xml.required = true
|
||||||
xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
|
xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
|
||||||
}
|
}
|
||||||
// We could remove the following setOnlyIf line, but then
|
// We could remove the following setOnlyIf line, but then
|
||||||
|
|
|
||||||
|
|
@ -113,17 +113,6 @@ SPDX-License-Identifier: CC0-1.0
|
||||||
<property name="message" value="Indent must not use tab characters. Use space instead."/>
|
<property name="message" value="Indent must not use tab characters. Use space instead."/>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
<module name="JavadocMethod">
|
|
||||||
<!-- TODO stricten those checks -->
|
|
||||||
<property name="scope" value="public"/>
|
|
||||||
<!--<property name="allowUndeclaredRTE" value="true"/>-->
|
|
||||||
<property name="allowMissingParamTags" value="true"/>
|
|
||||||
<property name="allowMissingThrowsTags" value="true"/>
|
|
||||||
<property name="allowMissingReturnTag" value="true"/>
|
|
||||||
<property name="allowMissingJavadoc" value="true"/>
|
|
||||||
<property name="suppressLoadErrors" value="true"/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<module name="JavadocStyle">
|
<module name="JavadocStyle">
|
||||||
<property name="scope" value="public"/>
|
<property name="scope" value="public"/>
|
||||||
<property name="checkEmptyJavadoc" value="true"/>
|
<property name="checkEmptyJavadoc" value="true"/>
|
||||||
|
|
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,7 @@ repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'ru.vyarus.animalsniffer'
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// animal sniffer for ensuring Android API compatibility
|
|
||||||
signature "net.sf.androidscents.signature:android-api-level-${animalsnifferSignatureVersion}@signature"
|
|
||||||
|
|
||||||
// JUnit
|
// JUnit
|
||||||
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||||
|
|
@ -35,10 +31,6 @@ dependencies {
|
||||||
testImplementation "org.bouncycastle:bcpg-jdk15to18:$bouncyPgVersion"
|
testImplementation "org.bouncycastle:bcpg-jdk15to18:$bouncyPgVersion"
|
||||||
}
|
}
|
||||||
|
|
||||||
animalsniffer {
|
|
||||||
sourceSets = [sourceSets.main]
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,7 @@ repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'ru.vyarus.animalsniffer'
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// animal sniffer for ensuring Android API compatibility
|
|
||||||
signature "net.sf.androidscents.signature:android-api-level-${animalsnifferSignatureVersion}@signature"
|
|
||||||
|
|
||||||
// JUnit for testing
|
// JUnit for testing
|
||||||
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"
|
||||||
|
|
@ -27,10 +22,6 @@ dependencies {
|
||||||
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
||||||
}
|
}
|
||||||
|
|
||||||
animalsniffer {
|
|
||||||
sourceSets = [sourceSets.main]
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,11 @@ allprojects {
|
||||||
ext {
|
ext {
|
||||||
shortVersion = '0.2.3'
|
shortVersion = '0.2.3'
|
||||||
isSnapshot = true
|
isSnapshot = true
|
||||||
minAndroidSdk = 26
|
javaSourceCompatibility = 11
|
||||||
animalsnifferSignatureVersion = "$minAndroidSdk:8.0.0_r2"
|
bouncycastleVersion = '1.82'
|
||||||
javaSourceCompatibility = 1.8
|
|
||||||
bouncycastleVersion = '1.75'
|
|
||||||
bouncyPgVersion = "$bouncycastleVersion"
|
bouncyPgVersion = "$bouncycastleVersion"
|
||||||
slf4jVersion = '1.7.36'
|
slf4jVersion = '1.7.36'
|
||||||
logbackVersion = '1.2.11'
|
logbackVersion = '1.5.13'
|
||||||
junitVersion = '5.8.2'
|
junitVersion = '5.8.2'
|
||||||
sqliteJdbcVersion = '3.42.0.0'
|
sqliteJdbcVersion = '3.42.0.0'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue