moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues Releases Wiki Activity

Merge pull request #71 from felixb/fix-gradle

Browse Source 
fix gradle build
This commit is contained in:
Dominik Schürmann 2013-08-15 06:29:56 -07:00
commit be251e8118
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
OpenPGP-Keychain/build.gradle
View File

@ -4,24 +4,29 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.4.1' classpath 'com.android.tools.build:gradle:0.5.+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
repositories {
mavenCentral()
}
dependencies { dependencies {
compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar']) 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 { android {
compileSdkVersion 17 compileSdkVersion 18
buildToolsVersion "17" buildToolsVersion "18.0.1"
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 17 targetSdkVersion 18
} }
sourceSets { sourceSets {
@ -38,26 +43,28 @@ android {
instrumentTest.setRoot('tests') instrumentTest.setRoot('tests')
} }
/* if (project.hasProperty('signingStoreLocation')) {
* To sign release build, create file gradle.properties in .gradle/ with this content: /*
* * To sign release build, create file gradle.properties in .gradle/ with this content:
* signingStoreLocation=/home/key.store *
* signingStorePassword=xxx * signingStoreLocation=/home/key.store
* signingKeyAlias=alias * signingStorePassword=xxx
* signingKeyPassword=xxx * signingKeyAlias=alias
*/ * signingKeyPassword=xxx
signingConfigs { */
myConfig { signingConfigs {
storeFile file(signingStoreLocation) myConfig {
storePassword signingStorePassword storeFile file(signingStoreLocation)
keyAlias signingKeyAlias storePassword signingStorePassword
keyPassword signingKeyPassword keyAlias signingKeyAlias
} keyPassword signingKeyPassword
} }
}
buildTypes { buildTypes {
release { release {
signingConfig signingConfigs.myConfig signingConfig signingConfigs.myConfig
}
} }
} }
} }

4
OpenPGP-Keychain/res/values/strings.xml
View File

@ -29,7 +29,6 @@
<string name="title_authentication">Passphrase</string> <string name="title_authentication">Passphrase</string>
<string name="title_createKey">Create Key</string> <string name="title_createKey">Create Key</string>
<string name="title_editKey">Edit Keyring</string> <string name="title_editKey">Edit Keyring</string>
<string name="title_createKey">Create Keyring</string>
<string name="title_preferences">Preferences</string> <string name="title_preferences">Preferences</string>
<string name="title_keyServerPreference">Key Server Preference</string> <string name="title_keyServerPreference">Key Server Preference</string>
<string name="title_changePassPhrase">Change Passphrase</string> <string name="title_changePassPhrase">Change Passphrase</string>
@ -41,7 +40,6 @@
<string name="title_exportKey">Export Keyring</string> <string name="title_exportKey">Export Keyring</string>
<string name="title_exportKeys">Export Keyrings</string> <string name="title_exportKeys">Export Keyrings</string>
<string name="title_keyNotFound">Key Not Found</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_keyServerQuery">Query Key Server</string>
<string name="title_sendKey">Export to Key Server</string> <string name="title_sendKey">Export to Key Server</string>
<string name="title_unknownSignatureKey">Unknown Signature Key</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_encrypt">OpenPGP: Encrypt</string>
<string name="intent_send_decrypt">OpenPGP: Decrypt</string> <string name="intent_send_decrypt">OpenPGP: Decrypt</string>
</resources> </resources>

2
settings.gradle
View File

@ -1 +1 @@
include ':OpenPGP-Keychain', ':libraries:ActionBarSherlock' include ':OpenPGP-Keychain'