Make conversations the root project

build.gradle

@@ -51,7 +51,11 @@ android {
 }
 
 dependencies {
-	// ToDo: Move libs here if possible (instead of including the jars)
+	compile project(':minidns')
-	"compile 'com.android.support:support-v13:19.1.0'"
+	compile project(':openpgpapilib')
+	compile project(':memorizingTrustManager')
+	compile 'com.android.support:support-v13:19.1.0'
+	// compile files('libs/bcprov-jdk15on-150.jar')
+	// compile files('libs/otr4j-0.10.jar')
 	compile fileTree(dir: 'libs', include: ['*.jar'])
 }

conversations/build.gradle

@@ -1,28 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
-
-    defaultConfig {
-        applicationId "eu.siacs.conversations"
-        minSdkVersion 14
-        targetSdkVersion 19
-    }
-
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    compile project(':minidns')
-    compile project(':openpgpapilib')
-    compile project(':memorizingTrustManager')
-    compile files('libs/android-support-v13.jar')
-    compile files('libs/bcprov-jdk15on-150.jar')
-    compile files('libs/otr4j-0.10.jar')
-}