PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Temporary fix for testDebug

Browse source
This commit is contained in:
Dominik Schürmann 2015-06-10 22:35:06 +02:00
parent 260364e267
commit 05fcbcae7b
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OpenKeychain/build.gradle
View file

@ -98,7 +98,9 @@ android {
defaultConfig {
minSdkVersion 15
targetSdkVersion 22
versionCode 32300
versionName "3.2.3"
applicationId "org.sufficientlysecure.keychain"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@ -124,6 +126,18 @@ android {
}
debug {
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.account\""
buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.provider\""
buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.tempstorage\""
// Reference them in .xml files.
resValue "string", "account_type", "org.sufficientlysecure.keychain.account"
resValue "string", "provider_authority", "org.sufficientlysecure.keychain.provider"
resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.tempstorage"
}
extra {
applicationIdSuffix ".debug"
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
@ -187,6 +201,12 @@ android {
}
}
// workaround?
//tasks.withType(Test).whenTaskAdded {
// project.android.defaultConfig.applicationId 'org.sufficientlysecure.keychain'
//}
// NOTE: This disables Lint!
tasks.whenTaskAdded { task ->
if (task.name.contains('lint')) {

6
OpenKeychain/src/main/AndroidManifest.xml
View file

@ -2,9 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
android:versionCode="32300"
android:versionName="3.2.3">
android:installLocation="auto">
<!--
General remarks
@ -724,7 +722,7 @@
<provider
android:name=".provider.KeychainProvider"
android:authorities="@string/provider_authority"
android:authorities="org.sufficientlysecure.keychain.provider"
android:exported="false" />
<!-- Internal classes of the remote APIs (not exported) -->