PGPainless/cert-d-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-java.git synced 2025-12-05 04:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade build system

Browse source
This commit is contained in:
Paul Schaub 2025-09-27 11:36:02 +02:00
parent e4128a002a
commit a0758c5541
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
6 changed files with 13 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

23
build.gradle
View file

@ -17,10 +17,6 @@ buildscript {
}
}
plugins {
id 'ru.vyarus.animalsniffer' version '1.5.3'
}
apply from: 'version.gradle'
allprojects {
@ -39,7 +35,7 @@ allprojects {
// checkstyle
checkstyle {
toolVersion = '8.18'
toolVersion = '10.26.0'
}
group 'org.pgpainless'
@ -65,8 +61,7 @@ allprojects {
isReleaseVersion = !isSnapshot
signingRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
sonatypeSnapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
sonatypeStagingUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
sonatypeStagingUrl = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'
}
if (isSnapshot) {
@ -83,7 +78,7 @@ allprojects {
}
jacoco {
toolVersion = "0.8.7"
toolVersion = "0.8.8"
}
jacocoTestReport {
@ -91,7 +86,7 @@ allprojects {
sourceDirectories.setFrom(project.files(sourceSets.main.allSource.srcDirs))
classDirectories.setFrom(project.files(sourceSets.main.output))
reports {
xml.enabled true
xml.required = true
}
}
@ -109,15 +104,15 @@ subprojects {
apply plugin: 'signing'
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}
task testsJar(type: Jar, dependsOn: testClasses) {
classifier = 'tests'
archiveClassifier = 'tests'
from sourceSets.test.output
}
@ -161,7 +156,7 @@ subprojects {
repositories {
if (sonatypeCredentialsAvailable) {
maven {
url isSnapshot ? sonatypeSnapshotUrl : sonatypeStagingUrl
url sonatypeStagingUrl
credentials {
username = sonatypeUsername
password = sonatypePassword
@ -214,7 +209,7 @@ task jacocoRootReport(type: JacocoReport) {
classDirectories.setFrom(files(subprojects.sourceSets.main.output))
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
reports {
xml.enabled true
xml.required = true
xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
}
// We could remove the following setOnlyIf line, but then

11
config/checkstyle/checkstyle.xml
View file

@ -113,17 +113,6 @@ SPDX-License-Identifier: CC0-1.0
<property name="message" value="Indent must not use tab characters. Use space instead."/>
</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">
<property name="scope" value="public"/>
<property name="checkEmptyJavadoc" value="true"/>

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists

8
pgp-cert-d-java/build.gradle
View file

@ -12,11 +12,7 @@ repositories {
mavenCentral()
}
apply plugin: 'ru.vyarus.animalsniffer'
dependencies {
// animal sniffer for ensuring Android API compatibility
signature "net.sf.androidscents.signature:android-api-level-${animalsnifferSignatureVersion}@signature"
// JUnit
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
@ -35,10 +31,6 @@ dependencies {
testImplementation "org.bouncycastle:bcpg-jdk15to18:$bouncyPgVersion"
}
animalsniffer {
sourceSets = [sourceSets.main]
}
test {
useJUnitPlatform()
}

9
pgp-certificate-store/build.gradle
View file

@ -12,12 +12,7 @@ repositories {
mavenCentral()
}
apply plugin: 'ru.vyarus.animalsniffer'
dependencies {
// animal sniffer for ensuring Android API compatibility
signature "net.sf.androidscents.signature:android-api-level-${animalsnifferSignatureVersion}@signature"
// JUnit for testing
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
@ -27,10 +22,6 @@ dependencies {
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
}
animalsniffer {
sourceSets = [sourceSets.main]
}
test {
useJUnitPlatform()
}

8
version.gradle
View file

@ -6,13 +6,11 @@ allprojects {
ext {
shortVersion = '0.2.3'
isSnapshot = true
minAndroidSdk = 26
animalsnifferSignatureVersion = "$minAndroidSdk:8.0.0_r2"
javaSourceCompatibility = 1.8
bouncycastleVersion = '1.75'
javaSourceCompatibility = 11
bouncycastleVersion = '1.82'
bouncyPgVersion = "$bouncycastleVersion"
slf4jVersion = '1.7.36'
logbackVersion = '1.2.11'
logbackVersion = '1.5.13'
junitVersion = '5.8.2'
sqliteJdbcVersion = '3.42.0.0'
}