move zipsigner into this app, its not maintained anywhere else

This commit is contained in:
Hans-Christoph Steiner 2018-04-19 14:50:12 +02:00
parent a2597ae3e8
commit dd16906982
39 changed files with 53 additions and 93 deletions

View File

@ -49,6 +49,10 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7'
compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7' compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'com.madgag.spongycastle:prov:1.54.0.0'
compile 'com.madgag.spongycastle:core:1.54.0.0'
testCompile "org.robolectric:robolectric:3.3.2" testCompile "org.robolectric:robolectric:3.3.2"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
// As per https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 // As per https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
@ -60,22 +64,6 @@ dependencies {
androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test:rules:0.5'
} }
if (!hasProperty('sourceDeps')) {
dependencies {
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'com.madgag.spongycastle:prov:1.54.0.0'
compile 'com.madgag.spongycastle:core:1.54.0.0'
// Upstream doesn't have a binary on mavenCentral, and it is an SVN repo on
// Google Code. We include this code directly in this repo, and have made
// modifications that should be pushed to anyone who wants to maintain it.
compile files('libs/binaryDeps/zipsigner.jar')
}
// Only do the libraries imported from maven repositories. Our own libraries
// (like privileged-api-lib) and the prebuilt jars already checked into the
// source code don't need to be here.
// generate using: `gradle -q calculateChecksums | sort -V` // generate using: `gradle -q calculateChecksums | sort -V`
dependencyVerification { dependencyVerification {
verify = [ verify = [
@ -127,34 +115,6 @@ if (!hasProperty('sourceDeps')) {
] ]
} }
} else {
logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)."
dependencies {
compile project(':extern:zipsigner')
}
task binaryDeps(type: Copy, dependsOn: ':app:prepareReleaseDependencies') {
enabled = project.hasProperty('sourceDeps')
description = "Copies .jar and .aar files from subproject dependencies in extern/ to app/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")"
from('../extern/') {
include 'zipsigner/build/libs/zipsigner.jar'
}
into 'libs/binaryDeps'
includeEmptyDirs false
eachFile { FileCopyDetails details ->
// Don't copy to a sub folder such as libs/binaryDeps/Project/build/outputs/aar/project.aar, but
// rather libs/binaryDeps/project.aar.
details.path = details.name
}
}
}
def isCi = "true".equals(System.getenv("CI")) def isCi = "true".equals(System.getenv("CI"))
def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))

Binary file not shown.