1 files changed, 34 insertions, 29 deletions
diff --git a/build.gradle b/build.gradle
index bcdff444..1e96e154 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,43 +12,49 @@ buildscript {
 
 allprojects {
 	repositories {
-		jcenter()
-		mavenCentral()
-		maven {
-			url 'http://lorenzo.villani.me/android-cropimage/'
-		}
 	}
 }
 
 apply plugin: 'com.android.application'
 
 repositories {
-	jcenter()
-	mavenCentral()
-}
-
-configurations {
-	playstoreCompile
+    flatDir {
+        dirs 'libs/3rdParty/jcenter', 'libs/3rdParty/maven'
+    }
 }
 
 dependencies {
-	compile project(':libs:MemorizingTrustManager')
-	compile 'org.sufficientlysecure:openpgp-api:10.0'
-	compile 'com.soundcloud.android:android-crop:1.0.1@aar'
-	compile 'com.android.support:support-v13:23.2.0'
-	compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-	compile 'org.bouncycastle:bcmail-jdk15on:1.52'
-	compile 'org.jitsi:org.otr4j:0.22'
-	compile 'org.gnu.inet:libidn:1.15'
-	compile 'com.google.zxing:core:3.2.1'
-	compile 'com.google.zxing:android-integration:3.2.1'
-	compile 'de.measite.minidns:minidns:0.1.7'
-	compile 'de.timroes.android:EnhancedListView:0.3.4'
-	compile 'me.leolin:ShortcutBadger:1.1.4@aar'
-	compile 'com.kyleduo.switchbutton:library:1.2.8'
-	compile 'org.whispersystems:axolotl-android:1.3.4'
-	compile 'com.makeramen:roundedimageview:2.2.0'
-	playstoreCompile 'com.google.android.gms:play-services-gcm:8.4.0'
+    // Local JAR files
+    //compile fileTree(dir: 'libs/zxing', includes: ['core-3.1.0.jar', 'android-integration-3.1.0.jar'])
+	compile name: 'zxing-core-3.2.1' //zxing
+	compile name: 'zxing-android-integration-3.2.1' //zxing
+    compile name: 'libidn-1.15'
+    compile name: 'minidns-0.1.7'
+    compile name: 'org.otr4j-0.22'
+    compile name: 'bcprov-jdk15on-1.52'
+    compile name: 'bcmail-jdk15on-1.52'
+    compile name: 'bcpkix-jdk15on-1.52'
+    compile name: 'EnhancedListView-0.3.4', ext: 'aar'
+    compile name: 'com.nineoldandroids.view.ViewHelper-2.4.0'
+    compile name: 'ShortcutBadger-1.1.4', ext: 'aar'
+    compile name: 'swipy-1.2.1', ext: 'aar'
+	compile name: 'axolotl-android-1.3.4', ext: 'aar'
+    compile name: 'axolotl-java-1.3.4'
+    compile name: 'curve25519-android-0.2.4', ext: 'aar' // axolotl, loaded from jcenter
+    compile name: 'curve25519-java-0.2.4' // axolotl, loaded from jcenter
+	compile name: 'protobuf-java-2.5.0' // axolotl, loaded from maven
+    compile name: 'android-crop-1.0.1', ext: 'aar'
+    compile name: 'roundedimageview-2.2.0', ext: 'aar'
+    compile name: 'openpgp-api-10.0', ext: 'aar' // loaded from jcenter
+
+    // Local modules
+    compile project(':libs:MemorizingTrustManager')
+    compile project(':libs:emojicon')
+	compile project(':libs:colorpicker')
+	compile project(':libs:thedevstacklogcat')
+
+    // Android dependencies
+    compile 'com.android.support:support-v13:23.2.0'
 }
 
 android {
@@ -61,7 +67,6 @@ android {
 		versionCode 135
 		versionName "1.11.3"
 		archivesBaseName += "-$versionName"
-		applicationId "eu.siacs.conversations"
 	}
 
 	compileOptions {