mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-04 16:25:05 -05:00
Merge branch 'master' into development
This commit is contained in:
commit
389d191448
@ -1,14 +1,11 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
jcenter()
|
||||||
// need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!)
|
|
||||||
// run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository
|
|
||||||
mavenLocal()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
|
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
|
||||||
classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT'
|
classpath 'com.novoda:gradle-android-test-plugin:0.10.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,28 +47,30 @@ android {
|
|||||||
projectUnderTest ':OpenKeychain'
|
projectUnderTest ':OpenKeychain'
|
||||||
}
|
}
|
||||||
|
|
||||||
jacoco {
|
//jacoco {
|
||||||
toolVersion = "0.7.0.201403182114"
|
// //toolVersion = "0.7.0.201403182114"
|
||||||
}
|
// toolVersion = "0.7.2.201409121644"
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//coverageSourceDirs = [
|
||||||
|
// '../OpenKeychain/src/main/java',
|
||||||
|
// '../OpenKeychain/src/gen',
|
||||||
|
// '../OpenKeychain/build/source/apt/debug',
|
||||||
|
// '../OpenKeychain/build/source/generated/buildConfig/debug',
|
||||||
|
// '../OpenKeychain/build/source/generated/r/debug'
|
||||||
|
// ]
|
||||||
|
|
||||||
coverageSourceDirs = [
|
//jacocoTestReport {
|
||||||
'../OpenKeychain/src/main/java',
|
// reports {
|
||||||
'../OpenKeychain/src/gen',
|
// xml.enabled = true
|
||||||
'../OpenKeychain/build/source/apt/debug',
|
// html.destination "${buildDir}/jacocoHtml"
|
||||||
'../OpenKeychain/build/source/generated/buildConfig/debug',
|
// }
|
||||||
'../OpenKeychain/build/source/generated/r/debug'
|
// // class R is used, but usage will not be covered, so ignore this class from report
|
||||||
]
|
// classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
|
||||||
|
// additionalSourceDirs = files(coverageSourceDirs)
|
||||||
jacocoTestReport {
|
// executionData = files('build/jacoco/testDebug.exec')
|
||||||
reports {
|
//}
|
||||||
xml.enabled = true
|
|
||||||
html.destination "${buildDir}/jacocoHtml"
|
|
||||||
}
|
|
||||||
// class R is used, but usage will not be covered, so ignore this class from report
|
|
||||||
classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
|
|
||||||
additionalSourceDirs = files(coverageSourceDirs)
|
|
||||||
executionData = files('build/jacoco/testDebug.exec')
|
|
||||||
}
|
|
||||||
|
|
||||||
// new workaround to force add custom output dirs for android studio
|
// new workaround to force add custom output dirs for android studio
|
||||||
task addTest {
|
task addTest {
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
package="org.sufficientlysecure.keychain"
|
package="org.sufficientlysecure.keychain"
|
||||||
android:installLocation="auto"
|
android:installLocation="auto"
|
||||||
android:versionCode="31200"
|
android:versionCode="31201"
|
||||||
android:versionName="3.1.2">
|
android:versionName="3.2beta1">
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
General remarks
|
General remarks
|
||||||
|
@ -5,7 +5,7 @@ buildscript {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
|
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
|
||||||
classpath 'com.android.tools.build:gradle:0.12.2'
|
classpath 'com.android.tools.build:gradle:1.0.0-rc3'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
task wrapper(type: Wrapper) {
|
||||||
gradleVersion = '1.12'
|
gradleVersion = '2.2.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
|
2
extern/KeybaseLib
vendored
2
extern/KeybaseLib
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 7f4980f0789d7bb3c2124080f32b3bec703c576e
|
Subproject commit 2b26d163df84a3d26c1c8da088ed3811b5ca6ec7
|
2
extern/StickyListHeaders
vendored
2
extern/StickyListHeaders
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 911f8ddfd007ce65aededae7e7b79e5a8d903a43
|
Subproject commit 62cc58c12d0c09b50984caf26e5afceda8873784
|
2
extern/SuperToasts
vendored
2
extern/SuperToasts
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 8578cfe6917cf16a9f123c1964e4bbff2a15be59
|
Subproject commit 77042d633f4dd430bcc86101e31dda52433db9c1
|
2
extern/TokenAutoComplete
vendored
2
extern/TokenAutoComplete
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 000fa65390b98106201a0ffaad76c5d85a35396c
|
Subproject commit ca46b4261c97221ddd4db135e7838d6fa145adf4
|
2
extern/minidns
vendored
2
extern/minidns
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 118fefcaaa44a7f31f5c18fa7e477f1665f654b6
|
Subproject commit f3a19080f15e220fbacab5045c1f15fd12513b35
|
2
extern/openkeychain-api-lib
vendored
2
extern/openkeychain-api-lib
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 57e58e7f7f51c4eecd7ee4b0f22c856485a243b7
|
Subproject commit 0cdbf32231739eac47999be71d6d01fc28375181
|
2
extern/openpgp-api-lib
vendored
2
extern/openpgp-api-lib
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc
|
Subproject commit e0ad1086a55eab66d963b4d5c6ca5544b454ef2d
|
2
extern/zxing-android-integration
vendored
2
extern/zxing-android-integration
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 1d787845663fd232f98f5e8e0923733c1a188f2a
|
Subproject commit e2d0064bd3171b7333af044bb30c25c85ee993dd
|
2
extern/zxing-qr-code
vendored
2
extern/zxing-qr-code
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 9ef2f3b66ea7cc283e865ec39434d023a18d17f3
|
Subproject commit 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b487
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Jun 09 22:04:23 CEST 2014
|
#Thu Dec 04 18:50:40 CET 2014
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
|
||||||
|
@ -10,16 +10,16 @@ if ! java -version 2>&1 | grep OpenJDK; then
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmpdir="$(mktemp -d)"
|
#tmpdir="$(mktemp -d)"
|
||||||
(
|
#(
|
||||||
cd "$tmpdir";
|
# cd "$tmpdir";
|
||||||
git clone https://github.com/nenick/gradle-android-test-plugin.git
|
# git clone https://github.com/nenick/gradle-android-test-plugin.git
|
||||||
cd gradle-android-test-plugin
|
# cd gradle-android-test-plugin
|
||||||
echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
|
# echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
|
||||||
echo "include ':gradle-android-test-plugin'" >> settings.gradle
|
# echo "include ':gradle-android-test-plugin'" >> settings.gradle
|
||||||
./gradlew :gradle-android-test-plugin:install
|
# ./gradlew :gradle-android-test-plugin:install
|
||||||
)
|
#)
|
||||||
rm -rf "$tmpdir"
|
#rm -rf "$tmpdir"
|
||||||
|
|
||||||
echo -n "ok, adding tests to include list.. "
|
echo -n "ok, adding tests to include list.. "
|
||||||
if grep OpenKeychain-Test settings.gradle >/dev/null ; then
|
if grep OpenKeychain-Test settings.gradle >/dev/null ; then
|
||||||
|
Loading…
Reference in New Issue
Block a user