aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-22 15:39:53 -0400
committerSam Whited <sam@samwhited.com>2014-10-22 15:39:53 -0400
commit07b47172a08c01c248c6f69bae48d9e60695a14b (patch)
tree2184208a18784b5f25687a80f43b6f5d970d2f47
parent038f7afd88572c7038fc11d984c56b910d72e97e (diff)
Add build deps and move build props to build file
-rw-r--r--build.gradle59
-rw-r--r--conversations/src/main/AndroidManifest.xml8
-rw-r--r--libs/bcprov-jdk15on-150.jarbin0 -> 2732684 bytes
-rw-r--r--libs/otr4j-0.10.jarbin0 -> 95873 bytes
4 files changed, 51 insertions, 16 deletions
diff --git a/build.gradle b/build.gradle
index 8942ba1c..ab032571 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,57 @@
// Top-level build file where you can add configuration options common to all
// sub-projects/modules.
buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.2'
- }
+ repositories {
+ jcenter()
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.2'
+ }
}
allprojects {
- repositories {
- jcenter()
- }
+ repositories {
+ jcenter()
+ mavenCentral()
+ }
+}
+
+apply plugin: 'android'
+
+repositories {
+ mavenCentral()
+}
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "19.1"
+
+ defaultConfig {
+ minSdkVersion 14
+ targetSdkVersion 19
+ versionCode 32
+ versionName "0.8-alpha"
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
+ buildTypes {
+ release {
+ runProguard true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ debug {
+ runProguard false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
+
+dependencies {
+ // ToDo: Move libs here if possible (instead of including the jars)
+ "compile 'com.android.support:support-v13:19.1.0'"
+ compile fileTree(dir: 'libs', include: ['*.jar'])
}
diff --git a/conversations/src/main/AndroidManifest.xml b/conversations/src/main/AndroidManifest.xml
index a66de8ba..7bde645f 100644
--- a/conversations/src/main/AndroidManifest.xml
+++ b/conversations/src/main/AndroidManifest.xml
@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="eu.siacs.conversations"
- android:versionCode="32"
- android:versionName="0.8-alpha" >
-
- <uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="19" />
+ package="eu.siacs.conversations">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/libs/bcprov-jdk15on-150.jar b/libs/bcprov-jdk15on-150.jar
new file mode 100644
index 00000000..d4b510d7
--- /dev/null
+++ b/libs/bcprov-jdk15on-150.jar
Binary files differ
diff --git a/libs/otr4j-0.10.jar b/libs/otr4j-0.10.jar
new file mode 100644
index 00000000..d4fc3a91
--- /dev/null
+++ b/libs/otr4j-0.10.jar
Binary files differ