diff options
| -rw-r--r-- | OpenPGP-Keychain/build.gradle | 55 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | settings.gradle | 2 |
3 files changed, 33 insertions, 28 deletions
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle index ec8e07cbd..a1bf3b783 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenPGP-Keychain/build.gradle @@ -4,24 +4,29 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.4.1' + classpath 'com.android.tools.build:gradle:0.5.+' } } apply plugin: 'android' +repositories { + mavenCentral() +} + dependencies { compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar']) - compile project(':libraries:ActionBarSherlock') + compile 'com.android.support:support-v4:13.0.+' + compile 'com.actionbarsherlock:actionbarsherlock:4.4.+@aar' } android { - compileSdkVersion 17 - buildToolsVersion "17" + compileSdkVersion 18 + buildToolsVersion "18.0.1" defaultConfig { minSdkVersion 8 - targetSdkVersion 17 + targetSdkVersion 18 } sourceSets { @@ -38,26 +43,28 @@ android { instrumentTest.setRoot('tests') } - /* - * To sign release build, create file gradle.properties in .gradle/ with this content: - * - * signingStoreLocation=/home/key.store - * signingStorePassword=xxx - * signingKeyAlias=alias - * signingKeyPassword=xxx - */ - signingConfigs { - myConfig { - storeFile file(signingStoreLocation) - storePassword signingStorePassword - keyAlias signingKeyAlias - keyPassword signingKeyPassword - } - } + if (project.hasProperty('signingStoreLocation')) { + /* + * To sign release build, create file gradle.properties in .gradle/ with this content: + * + * signingStoreLocation=/home/key.store + * signingStorePassword=xxx + * signingKeyAlias=alias + * signingKeyPassword=xxx + */ + signingConfigs { + myConfig { + storeFile file(signingStoreLocation) + storePassword signingStorePassword + keyAlias signingKeyAlias + keyPassword signingKeyPassword + } + } - buildTypes { - release { - signingConfig signingConfigs.myConfig + buildTypes { + release { + signingConfig signingConfigs.myConfig + } } } } diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index a0787a63a..3c4634eb6 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -29,7 +29,6 @@ <string name="title_authentication">Passphrase</string> <string name="title_createKey">Create Key</string> <string name="title_editKey">Edit Keyring</string> - <string name="title_createKey">Create Keyring</string> <string name="title_preferences">Preferences</string> <string name="title_keyServerPreference">Key Server Preference</string> <string name="title_changePassPhrase">Change Passphrase</string> @@ -41,7 +40,6 @@ <string name="title_exportKey">Export Keyring</string> <string name="title_exportKeys">Export Keyrings</string> <string name="title_keyNotFound">Key Not Found</string> - <string name="title_help">Getting Started</string> <string name="title_keyServerQuery">Query Key Server</string> <string name="title_sendKey">Export to Key Server</string> <string name="title_unknownSignatureKey">Unknown Signature Key</string> @@ -364,4 +362,4 @@ <string name="intent_send_encrypt">OpenPGP: Encrypt</string> <string name="intent_send_decrypt">OpenPGP: Decrypt</string> -</resources>
\ No newline at end of file +</resources> diff --git a/settings.gradle b/settings.gradle index 9df383b2a..e9f3917ee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':OpenPGP-Keychain', ':libraries:ActionBarSherlock' +include ':OpenPGP-Keychain' |