Merge pull request #71 from felixb/fix-gradle

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

View File

@ -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
}
}
}
}

View File

@ -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>
</resources>

View File

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