diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-10 22:35:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-10 22:35:06 +0200 |
| commit | 05fcbcae7b816e72363030d499a43e0e6042b320 (patch) | |
| tree | c5aa0560a971b4c4480704f750b8cce40a69e5ad | |
| parent | 260364e267ea4a5a227bf67a9867364578aecef3 (diff) | |
| download | open-keychain-05fcbcae7b816e72363030d499a43e0e6042b320.tar.gz open-keychain-05fcbcae7b816e72363030d499a43e0e6042b320.tar.bz2 open-keychain-05fcbcae7b816e72363030d499a43e0e6042b320.zip | |
Temporary fix for testDebug
| -rw-r--r-- | OpenKeychain/build.gradle | 22 | ||||
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 |
2 files changed, 23 insertions, 5 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 88480966e..ad31dc48d 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -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')) { diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index ae39ee9ce..884aa6544 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -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) --> |