move zipsigner into this app, its not maintained anywhere else
This commit is contained in:
parent
a2597ae3e8
commit
dd16906982
app
build.gradle
libs/binaryDeps
src/main/java/kellinwood
logging
AbstractLogger.javaConsoleLoggerFactory.javaLoggerFactory.javaLoggerInterface.javaLoggerManager.javaNullLoggerFactory.javaStreamLogger.java
security/zipsigner
AutoKeyException.javaBase64.javaDefaultResourceAdapter.javaHexDumpEncoder.javaHexEncoder.javaKeySet.javaProgressEvent.javaProgressHelper.javaProgressListener.javaResourceAdapter.javaZipSignature.javaZipSigner.java
optional
zipio
@ -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,24 +64,8 @@ dependencies {
|
|||||||
androidTestCompile 'com.android.support.test:rules:0.5'
|
androidTestCompile 'com.android.support.test:rules:0.5'
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hasProperty('sourceDeps')) {
|
// generate using: `gradle -q calculateChecksums | sort -V`
|
||||||
|
dependencyVerification {
|
||||||
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`
|
|
||||||
dependencyVerification {
|
|
||||||
verify = [
|
verify = [
|
||||||
'android.arch.core:common:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd',
|
'android.arch.core:common:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd',
|
||||||
'android.arch.core:runtime:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3',
|
'android.arch.core:runtime:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3',
|
||||||
@ -125,34 +113,6 @@ if (!hasProperty('sourceDeps')) {
|
|||||||
'org.jmdns:jmdns:24e7e3a50a579136400e8c9b0750399eb3c7558918bdf52c0ffa5e0fa5aad503',
|
'org.jmdns:jmdns:24e7e3a50a579136400e8c9b0750399eb3c7558918bdf52c0ffa5e0fa5aad503',
|
||||||
'org.slf4j:slf4j-api:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b',
|
'org.slf4j:slf4j-api:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b',
|
||||||
]
|
]
|
||||||
}
|
|
||||||
|
|
||||||
} 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"))
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user