mirror of
https://codeberg.org/PGPainless/sop-java.git
synced 2025-09-09 10:19:47 +02:00
Compare commits
27 commits
f2d40bba17
...
ced207382c
Author | SHA1 | Date | |
---|---|---|---|
ced207382c | |||
4325bfb2ee | |||
6796ec95e7 | |||
a705bb4c3d | |||
051499974d | |||
cbdcfe54cb | |||
f7e6de4aaa | |||
a906028ce7 | |||
3700c60fde | |||
1084cf6128 | |||
7ee856f9b9 | |||
b42b966866 | |||
0b68d9f04e | |||
db315e9ed2 | |||
966ea3c3a6 | |||
f6d7af2dab | |||
3367450f94 | |||
54782d2a22 | |||
83eafd8817 | |||
6c7fcfccce | |||
04f7a5d30d | |||
88d3301daa | |||
6fc849bb6a | |||
5bebdb779a | |||
3e6e47ed50 | |||
023b4ea45b | |||
dd07d10350 |
4 changed files with 18 additions and 21 deletions
25
build.gradle
25
build.gradle
|
@ -68,6 +68,8 @@ allprojects {
|
|||
description = "Stateless OpenPGP Protocol API for Java"
|
||||
version = shortVersion
|
||||
|
||||
sourceCompatibility = javaSourceCompatibility
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
@ -76,13 +78,6 @@ allprojects {
|
|||
tasks.withType(AbstractArchiveTask) {
|
||||
preserveFileTimestamps = false
|
||||
reproducibleFileOrder = true
|
||||
|
||||
dirMode = 0755
|
||||
fileMode = 0644
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(javaSourceCompatibility)
|
||||
}
|
||||
|
||||
// Compatibility of default implementations in kotlin interfaces with Java implementations.
|
||||
|
@ -117,7 +112,7 @@ allprojects {
|
|||
}
|
||||
|
||||
jacoco {
|
||||
toolVersion = "0.8.8"
|
||||
toolVersion = "0.8.7"
|
||||
}
|
||||
|
||||
jacocoTestReport {
|
||||
|
@ -125,7 +120,7 @@ allprojects {
|
|||
sourceDirectories.setFrom(project.files(sourceSets.main.allSource.srcDirs))
|
||||
classDirectories.setFrom(project.files(sourceSets.main.output))
|
||||
reports {
|
||||
xml.required = true
|
||||
xml.enabled true
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -143,15 +138,15 @@ subprojects {
|
|||
apply plugin: 'signing'
|
||||
|
||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||
archiveClassifier = 'sources'
|
||||
classifier = 'sources'
|
||||
from sourceSets.main.allSource
|
||||
}
|
||||
task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||
archiveClassifier = 'javadoc'
|
||||
classifier = 'javadoc'
|
||||
from javadoc.destinationDir
|
||||
}
|
||||
task testsJar(type: Jar, dependsOn: testClasses) {
|
||||
archiveClassifier = 'tests'
|
||||
classifier = 'tests'
|
||||
from sourceSets.test.output
|
||||
}
|
||||
|
||||
|
@ -248,7 +243,7 @@ task jacocoRootReport(type: JacocoReport) {
|
|||
classDirectories.setFrom(files(subprojects.sourceSets.main.output))
|
||||
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
|
||||
reports {
|
||||
xml.required = true
|
||||
xml.enabled true
|
||||
xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
|
||||
}
|
||||
// We could remove the following setOnlyIf line, but then
|
||||
|
@ -259,6 +254,10 @@ task jacocoRootReport(type: JacocoReport) {
|
|||
}
|
||||
|
||||
task javadocAll(type: Javadoc) {
|
||||
def currentJavaVersion = JavaVersion.current()
|
||||
if (currentJavaVersion.compareTo(JavaVersion.VERSION_1_9) >= 0) {
|
||||
options.addStringOption("-release", "8");
|
||||
}
|
||||
source subprojects.collect {project ->
|
||||
project.sourceSets.main.allJava }
|
||||
destinationDir = new File(buildDir, 'javadoc')
|
||||
|
|
|
@ -21,9 +21,7 @@ class UpdateKeyExternal(binary: String, environment: Properties) : UpdateKey {
|
|||
|
||||
override fun signingOnly(): UpdateKey = apply { commandList.add("--signing-only") }
|
||||
|
||||
override fun noAddedCapabilities(): UpdateKey = apply {
|
||||
commandList.add("--no-added-capabilities")
|
||||
}
|
||||
override fun noAddedCapabilities(): UpdateKey = apply { commandList.add("--no-added-capabilities") }
|
||||
|
||||
override fun withKeyPassword(password: ByteArray): UpdateKey = apply {
|
||||
commandList.add("--with-key-password=@ENV:KEY_PASSWORD_$argCount")
|
||||
|
|
|
@ -20,14 +20,14 @@ interface UpdateKey {
|
|||
fun noArmor(): UpdateKey
|
||||
|
||||
/**
|
||||
* Allow key to be used for signing only. If this option is not present, the operation may add a
|
||||
* new, encryption-capable component key.
|
||||
* Allow key to be used for signing only.
|
||||
* If this option is not present, the operation may add a new, encryption-capable component key.
|
||||
*/
|
||||
@Throws(SOPGPException.UnsupportedOption::class) fun signingOnly(): UpdateKey
|
||||
|
||||
/**
|
||||
* Do not allow adding new capabilities to the key. If this option is not present, the operation
|
||||
* may add support for new capabilities to the key.
|
||||
* Do not allow adding new capabilities to the key.
|
||||
* If this option is not present, the operation may add support for new capabilities to the key.
|
||||
*/
|
||||
@Throws(SOPGPException.UnsupportedOption::class) fun noAddedCapabilities(): UpdateKey
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ allprojects {
|
|||
shortVersion = '11.0.0'
|
||||
isSnapshot = true
|
||||
minAndroidSdk = 10
|
||||
javaSourceCompatibility = 11
|
||||
javaSourceCompatibility = 1.8
|
||||
gsonVersion = '2.10.1'
|
||||
jsrVersion = '3.0.2'
|
||||
junitVersion = '5.8.2'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue