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

Include spongycastle

Browse Source
This commit is contained in:
Daniel Martí 2014-05-20 19:12:29 +02:00
parent dd60f5cd3b
commit 29048a0c60
4 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -29,3 +29,6 @@
[submodule "extern/nanohttpd"] [submodule "extern/nanohttpd"]
path = extern/nanohttpd path = extern/nanohttpd
url = https://github.com/NanoHttpd/nanohttpd url = https://github.com/NanoHttpd/nanohttpd
[submodule "extern/spongycastle"]
path = extern/spongycastle
url = https://github.com/open-keychain/spongycastle

62
build.gradle
View File

@ -12,7 +12,7 @@ apply plugin: 'android'
sdkLoc = System.getenv("ANDROID_HOME") sdkLoc = System.getenv("ANDROID_HOME")
FileCollection getAndroidPrebuilt(String apiLevel) { FileCollection getAndroidPrebuilt(String apiLevel) {
files("$sdkLoc/platforms/android-$apiLevel/android.jar") files("$sdkLoc/platforms/android-$apiLevel/android.jar")
} }
dependencies { dependencies {
@ -24,6 +24,10 @@ dependencies {
compile project(':extern:libsuperuser:libsuperuser') compile project(':extern:libsuperuser:libsuperuser')
compile project(':extern:nanohttpd:core') compile project(':extern:nanohttpd:core')
compile project(':extern:zipsigner') compile project(':extern:zipsigner')
compile project(':extern:spongycastle:core')
compile project(':extern:spongycastle:pg')
compile project(':extern:spongycastle:pkix')
compile project(':extern:spongycastle:prov')
} }
project(':extern:UniversalImageLoader:library') { project(':extern:UniversalImageLoader:library') {
@ -56,7 +60,7 @@ project(':extern:UniversalImageLoader:library') {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion toolVersion buildToolsVersion toolVersion
sourceSets { sourceSets {
main { main {
@ -79,7 +83,7 @@ android {
} }
} }
tasks.withType(Compile) { task -> tasks.withType(Compile) { task ->
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -90,37 +94,37 @@ android {
// http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation // http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
task("generate${variant.name}Javadoc", type: Javadoc) { task("generate${variant.name}Javadoc", type: Javadoc) {
title = "$name $version API" title = "$name $version API"
description "Generates Javadoc for F-Droid." description "Generates Javadoc for F-Droid."
source = variant.javaCompile.source source = variant.javaCompile.source
ext.androidJar = "${android.plugin.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" ext.androidJar = "${android.plugin.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
options.links("http://docs.oracle.com/javase/7/docs/api/"); options.links("http://docs.oracle.com/javase/7/docs/api/");
options.links("http://d.android.com/reference/"); options.links("http://d.android.com/reference/");
exclude '**/BuildConfig.java' exclude '**/BuildConfig.java'
exclude '**/R.java' exclude '**/R.java'
} }
} }
// This is the hacky way which we force the subprojects to use the same build tools: // This is the hacky way which we force the subprojects to use the same build tools:
// http://stackoverflow.com/a/21032272 // http://stackoverflow.com/a/21032272
subprojects { subprojects {
afterEvaluate { afterEvaluate {
android { android {
// The android build task only lets you configure the buildToolsVersion once, so if // The android build task only lets you configure the buildToolsVersion once, so if
// we execute the closure below to configure our subprojects, it will fail when it // we execute the closure below to configure our subprojects, it will fail when it
// hits the second subproject. Therefore, we will only do it once, and I guess the // hits the second subproject. Therefore, we will only do it once, and I guess the
// android plubin will re-use the existing value I set. // android plubin will re-use the existing value I set.
// https://android.googlesource.com/platform/tools/build/+/master/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy // https://android.googlesource.com/platform/tools/build/+/master/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
try { try {
buildToolsVersion toolVersion buildToolsVersion toolVersion
logger.info("Set buildToolsVersion to $toolVersion") logger.info("Set buildToolsVersion to $toolVersion")
} catch (GradleException e) { } catch (GradleException e) {
logger.info("Tried to set the buildToolsVersion, however we were not allowed to: $e.message") logger.info("Tried to set the buildToolsVersion, however we were not allowed to: $e.message")
} }
} }
} }
} }

1
extern/spongycastle vendored Submodule

@ -0,0 +1 @@
Subproject commit eb2c35bd0602d05a65c10c86b9c9834ebd1a81c6

4
settings.gradle
View File

@ -4,6 +4,10 @@ include ':extern:MemorizingTrustManager'
include ':extern:libsuperuser:libsuperuser' include ':extern:libsuperuser:libsuperuser'
include ':extern:nanohttpd:core' include ':extern:nanohttpd:core'
include ':extern:zipsigner' include ':extern:zipsigner'
include ':extern:spongycastle:core'
include ':extern:spongycastle:pg'
include ':extern:spongycastle:pkix'
include ':extern:spongycastle:prov'
include ':support-v4' include ':support-v4'
project(':support-v4').projectDir = new File('extern/Support/v4') project(':support-v4').projectDir = new File('extern/Support/v4')