diff options
-rw-r--r-- | OpenKeychain-Test/build.gradle | 51 | ||||
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 | ||||
-rw-r--r-- | build.gradle | 4 | ||||
m--------- | extern/KeybaseLib | 0 | ||||
m--------- | extern/StickyListHeaders | 0 | ||||
m--------- | extern/SuperToasts | 0 | ||||
m--------- | extern/TokenAutoComplete | 0 | ||||
m--------- | extern/minidns | 0 | ||||
m--------- | extern/openkeychain-api-lib | 0 | ||||
m--------- | extern/openpgp-api-lib | 0 | ||||
m--------- | extern/zxing-android-integration | 0 | ||||
m--------- | extern/zxing-qr-code | 0 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 50557 -> 51018 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
-rwxr-xr-x | prepare-tests.sh | 20 |
15 files changed, 42 insertions, 43 deletions
diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle index bb6c3d181..83932161f 100644 --- a/OpenKeychain-Test/build.gradle +++ b/OpenKeychain-Test/build.gradle @@ -1,14 +1,11 @@ buildscript { repositories { - mavenCentral() - // 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() + jcenter() } dependencies { // 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' } -jacoco { - toolVersion = "0.7.0.201403182114" -} - -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' - ] +//jacoco { +// //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' +// ] -jacocoTestReport { - 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') -} +//jacocoTestReport { +// 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 task addTest { diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 18fcc4b42..100f584c1 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.sufficientlysecure.keychain" android:installLocation="auto" - android:versionCode="31200" - android:versionName="3.1.2"> + android:versionCode="31201" + android:versionName="3.2beta1"> <!-- General remarks @@ -15,7 +15,7 @@ Association of file types to Keychain ===================================== General remarks about file ending conventions: - - *.gpg for binary files + - *.gpg for binary files - *.asc for ascii armored files The actual content can be anything. The file ending only shows if it is binary or ascii encoded. diff --git a/build.gradle b/build.gradle index 2e7ab3d86..59f05e73a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { dependencies { // 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) { - gradleVersion = '1.12' + gradleVersion = '2.2.1' } subprojects { diff --git a/extern/KeybaseLib b/extern/KeybaseLib -Subproject 7f4980f0789d7bb3c2124080f32b3bec703c576 +Subproject 2b26d163df84a3d26c1c8da088ed3811b5ca6ec diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders -Subproject 911f8ddfd007ce65aededae7e7b79e5a8d903a4 +Subproject 62cc58c12d0c09b50984caf26e5afceda887378 diff --git a/extern/SuperToasts b/extern/SuperToasts -Subproject 8578cfe6917cf16a9f123c1964e4bbff2a15be5 +Subproject 77042d633f4dd430bcc86101e31dda52433db9c diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete -Subproject 000fa65390b98106201a0ffaad76c5d85a35396 +Subproject ca46b4261c97221ddd4db135e7838d6fa145adf diff --git a/extern/minidns b/extern/minidns -Subproject 118fefcaaa44a7f31f5c18fa7e477f1665f654b +Subproject f3a19080f15e220fbacab5045c1f15fd12513b3 diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 57e58e7f7f51c4eecd7ee4b0f22c856485a243b +Subproject 0cdbf32231739eac47999be71d6d01fc2837518 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 0be263d5d3effd2df5f976fa4a127017268749c +Subproject e0ad1086a55eab66d963b4d5c6ca5544b454ef2 diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration -Subproject 1d787845663fd232f98f5e8e0923733c1a188f2 +Subproject e2d0064bd3171b7333af044bb30c25c85ee993d diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code -Subproject 9ef2f3b66ea7cc283e865ec39434d023a18d17f +Subproject 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b48 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 583859812..c97a8bdb9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cc3d5d9a3..120a028f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 09 22:04:23 CEST 2014 +#Thu Dec 04 18:50:40 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 diff --git a/prepare-tests.sh b/prepare-tests.sh index 027c76f84..623c4a233 100755 --- a/prepare-tests.sh +++ b/prepare-tests.sh @@ -10,16 +10,16 @@ if ! java -version 2>&1 | grep OpenJDK; then return fi -tmpdir="$(mktemp -d)" -( - cd "$tmpdir"; - git clone https://github.com/nenick/gradle-android-test-plugin.git - cd gradle-android-test-plugin - echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle - echo "include ':gradle-android-test-plugin'" >> settings.gradle - ./gradlew :gradle-android-test-plugin:install -) -rm -rf "$tmpdir" +#tmpdir="$(mktemp -d)" +#( +# cd "$tmpdir"; +# git clone https://github.com/nenick/gradle-android-test-plugin.git +# cd gradle-android-test-plugin +# echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle +# echo "include ':gradle-android-test-plugin'" >> settings.gradle +# ./gradlew :gradle-android-test-plugin:install +#) +#rm -rf "$tmpdir" echo -n "ok, adding tests to include list.. " if grep OpenKeychain-Test settings.gradle >/dev/null ; then |