diff --git a/build.gradle b/build.gradle
index 020268e..3a8c1ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 531fde9..73313cc 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -113,17 +113,6 @@ SPDX-License-Identifier: CC0-1.0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a9715..0d18421 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/pgp-cert-d-java/build.gradle b/pgp-cert-d-java/build.gradle
index 19f1329..ac3ba2a 100644
--- a/pgp-cert-d-java/build.gradle
+++ b/pgp-cert-d-java/build.gradle
@@ -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()
}
diff --git a/pgp-certificate-store/build.gradle b/pgp-certificate-store/build.gradle
index c994a8b..4f8ae96 100644
--- a/pgp-certificate-store/build.gradle
+++ b/pgp-certificate-store/build.gradle
@@ -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()
}
diff --git a/version.gradle b/version.gradle
index 2903026..404fa63 100644
--- a/version.gradle
+++ b/version.gradle
@@ -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'
}