ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 01:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Prefer files to paths when configuring ProGuard. (#3679)

Browse Source
This commit is contained in:
Chris Rankin 2018-07-24 13:52:45 +01:00 committed by GitHub
parent 2a5b7371d0
commit 0e9b04a6d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core-deterministic/build.gradle
View File

@ -59,13 +59,13 @@ task patchCore(type: Zip, dependsOn: coreJarTask) {
import proguard.gradle.ProGuardTask
task predeterminise(type: ProGuardTask) {
injars patchCore
outjars "$buildDir/proguard/pre-deterministic-${project.version}.jar"
outjars file("$buildDir/proguard/pre-deterministic-${project.version}.jar")
libraryjars "$javaHome/lib/rt.jar"
libraryjars "$javaHome/lib/jce.jar"
libraryjars file("$javaHome/lib/rt.jar")
libraryjars file("$javaHome/lib/jce.jar")
configurations.compileOnly.forEach {
if (originalJar.path != it.path) {
libraryjars it.path, filter: '!META-INF/versions/**'
if (originalJar != it) {
libraryjars it, filter: '!META-INF/versions/**'
}
}
@ -108,12 +108,12 @@ task jarFilter(type: JarFilterTask) {
task determinise(type: ProGuardTask) {
injars jarFilter
outjars "$buildDir/proguard/$jarBaseName-${project.version}.jar"
outjars file("$buildDir/proguard/$jarBaseName-${project.version}.jar")
libraryjars "$javaHome/lib/rt.jar"
libraryjars "$javaHome/lib/jce.jar"
libraryjars file("$javaHome/lib/rt.jar")
libraryjars file("$javaHome/lib/jce.jar")
configurations.runtimeLibraries.forEach {
libraryjars it.path, filter: '!META-INF/versions/**'
libraryjars it, filter: '!META-INF/versions/**'
}
// Analyse the JAR for dead code, and remove (some of) it.
@ -153,7 +153,7 @@ task checkDeterminism(type: ProGuardTask, dependsOn: jdkTask) {
libraryjars deterministic_rt_jar
configurations.runtimeLibraries.forEach {
libraryjars it.path, filter: '!META-INF/versions/**'
libraryjars it, filter: '!META-INF/versions/**'
}
keepattributes '*'

22
serialization-deterministic/build.gradle
View File

@ -59,14 +59,14 @@ task patchSerialization(type: Zip, dependsOn: serializationJarTask) {
import proguard.gradle.ProGuardTask
task predeterminise(type: ProGuardTask, dependsOn: project(':core-deterministic').assemble) {
injars patchSerialization
outjars "$buildDir/proguard/pre-deterministic-${project.version}.jar"
outjars file("$buildDir/proguard/pre-deterministic-${project.version}.jar")
libraryjars "$javaHome/lib/rt.jar"
libraryjars "$javaHome/lib/jce.jar"
libraryjars "$javaHome/lib/ext/sunec.jar"
libraryjars file("$javaHome/lib/rt.jar")
libraryjars file("$javaHome/lib/jce.jar")
libraryjars file("$javaHome/lib/ext/sunec.jar")
configurations.compileOnly.forEach {
if (originalJar.path != it.path) {
libraryjars it.path, filter: '!META-INF/versions/**'
if (originalJar != it) {
libraryjars it, filter: '!META-INF/versions/**'
}
}
@ -104,12 +104,12 @@ task jarFilter(type: JarFilterTask) {
task determinise(type: ProGuardTask) {
injars jarFilter
outjars "$buildDir/proguard/$jarBaseName-${project.version}.jar"
outjars file("$buildDir/proguard/$jarBaseName-${project.version}.jar")
libraryjars "$javaHome/lib/rt.jar"
libraryjars "$javaHome/lib/jce.jar"
libraryjars file("$javaHome/lib/rt.jar")
libraryjars file("$javaHome/lib/jce.jar")
configurations.runtimeLibraries.forEach {
libraryjars it.path, filter: '!META-INF/versions/**'
libraryjars it, filter: '!META-INF/versions/**'
}
// Analyse the JAR for dead code, and remove (some of) it.
@ -143,7 +143,7 @@ task checkDeterminism(type: ProGuardTask, dependsOn: jdkTask) {
libraryjars deterministic_rt_jar
configurations.runtimeLibraries.forEach {
libraryjars it.path, filter: '!META-INF/versions/**'
libraryjars it, filter: '!META-INF/versions/**'
}
keepattributes '*'