moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Fix gradle build

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-15 13:47:30 +02:00
parent d885f145a0
commit 96de7cb101
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain-API-Demo/AndroidManifest.xml
View File

@ -6,7 +6,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="7" android:minSdkVersion="7"
android:targetSdkVersion="14" /> android:targetSdkVersion="18" />
<application <application
android:allowBackup="true" android:allowBackup="true"

2
OpenPGP-Keychain-API-Demo/project.properties
View File

@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-15 target=android-18

2
OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java
View File

@ -84,7 +84,7 @@ public class OpenPgpSignatureResult implements Parcelable {
public String toString() { public String toString() {
String out = new String(); String out = new String();
out += "\nsignatureStatus: " + signatureStatus; out += "\nsignatureStatus: " + signatureStatus;
out += "signatureUserId: " + signatureUserId; out += "\nsignatureUserId: " + signatureUserId;
out += "\nsignatureOnly: " + signatureOnly; out += "\nsignatureOnly: " + signatureOnly;
return out; return out;
} }

2
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -44,7 +44,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
android:targetSdkVersion="17" /> android:targetSdkVersion="18" />
<uses-feature <uses-feature
android:name="android.hardware.wifi" android:name="android.hardware.wifi"

9
OpenPGP-Keychain/build.gradle
View File

@ -14,10 +14,13 @@ repositories {
mavenCentral() mavenCentral()
} }
/*
* NOTE: Avoid dependencies from Maven. Include as much sources as possible for F-Droid!
*/
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 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock compile 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock
compile 'com.actionbarsherlock:actionbarsherlock:4.4.+@aar' compile project(':libraries:ActionBarSherlock')
compile project(':libraries:HtmlTextView') compile project(':libraries:HtmlTextView')
} }
@ -27,7 +30,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 17 targetSdkVersion 18
} }
sourceSets { sourceSets {

2
OpenPGP-Keychain/project.properties
View File

@ -8,6 +8,6 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-17 target=android-18
android.library.reference.1=../libraries/ActionBarSherlock android.library.reference.1=../libraries/ActionBarSherlock
android.library.reference.2=../libraries/HtmlTextView android.library.reference.2=../libraries/HtmlTextView

2
OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
View File

@ -84,7 +84,7 @@ public class OpenPgpSignatureResult implements Parcelable {
public String toString() { public String toString() {
String out = new String(); String out = new String();
out += "\nsignatureStatus: " + signatureStatus; out += "\nsignatureStatus: " + signatureStatus;
out += "signatureUserId: " + signatureUserId; out += "\nsignatureUserId: " + signatureUserId;
out += "\nsignatureOnly: " + signatureOnly; out += "\nsignatureOnly: " + signatureOnly;
return out; return out;
} }