Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -PsourceDeps build

Browse Source 
We can't do verification since spongycastle isn't imported in the sourceDeps
build, and witness complains about missing libs.
This commit is contained in:
Daniel Martí 2015-10-08 19:22:15 +02:00
parent 2d62c94b5f
commit 2211dc38bb
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
F-Droid/build.gradle
View File

@ -49,41 +49,6 @@ if (!hasProperty('sourceDeps')) {
androidTestCompile 'commons-io:commons-io:2.2' androidTestCompile 'commons-io:commons-io:2.2'
} }
} else {
logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)."
repositories {
jcenter()
}
dependencies {
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:support-annotations:22.2.1'
compile project(':privileged-api-lib')
compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.google.zxing:core:3.2.1'
compile 'eu.chainfire:libsuperuser:1.0.0.201504231659'
compile 'cc.mvdan.accesspoint:library:0.1.1'
compile 'info.guardianproject.netcipher:netcipher:1.2'
compile 'commons-net:commons-net:3.3'
compile 'org.openhab.jmdns:jmdns:3.4.2'
compile(project(':extern:support-v4-preferencefragment')) {
exclude module: 'support-v4'
}
compile project(':extern:nanohttpd:core')
compile project(':extern:zipsigner')
androidTestCompile 'commons-io:commons-io:2.2'
}
}
// Only do the libraries imported from maven repositories. Our own libraries // Only do the libraries imported from maven repositories. Our own libraries
// (like privileged-api-lib) and the prebuilt jars already checked into the // (like privileged-api-lib) and the prebuilt jars already checked into the
// source code don't need to be here. // source code don't need to be here.
@ -106,6 +71,41 @@ dependencyVerification {
] ]
} }
} else {
logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)."
repositories {
jcenter()
}
dependencies {
compile project(':privileged-api-lib')
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:support-annotations:22.2.1'
compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.google.zxing:core:3.2.1'
compile 'eu.chainfire:libsuperuser:1.0.0.201504231659'
compile 'cc.mvdan.accesspoint:library:0.1.3'
compile 'info.guardianproject.netcipher:netcipher:1.2'
compile 'commons-net:commons-net:3.3'
compile 'org.openhab.jmdns:jmdns:3.4.2'
compile(project(':extern:support-v4-preferencefragment')) {
exclude module: 'support-v4'
}
compile project(':extern:nanohttpd:core')
compile project(':extern:zipsigner')
androidTestCompile 'commons-io:commons-io:2.2'
}
}
task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') { task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
enabled = project.hasProperty('sourceDeps') enabled = project.hasProperty('sourceDeps')