Fixed third party library references in gradle

build.gradle

@@ -12,11 +12,6 @@ buildscript {
 
 allprojects {
 	repositories {
-		jcenter()
-		mavenCentral()
-		maven {
-			url 'http://lorenzo.villani.me/android-cropimage/'
-		}
 	}
 }
 
@@ -24,33 +19,31 @@ apply plugin: 'com.android.application'
 
 repositories {
     flatDir {
-        dirs 'libs/3rdParty', 'libs/3rdParty/zxing'
+        dirs 'libs/3rdParty/jcenter', 'libs/3rdParty/maven'
     }
-	jcenter()
-	mavenCentral()
 }
 
 dependencies {
-	compile 'com.soundcloud.android:android-crop:1.0.1@aar'
-	compile 'org.bouncycastle:bcmail-jdk15on:1.52'
-	compile 'com.kyleduo.switchbutton:library:1.2.8'
-	compile 'org.whispersystems:axolotl-android:1.3.4'
-	compile 'com.makeramen:roundedimageview:2.2.0'
-
     // Local JAR files
     //compile fileTree(dir: 'libs/zxing', includes: ['core-3.1.0.jar', 'android-integration-3.1.0.jar'])
-	compile name: 'core-3.2.1' //zxing
-	compile name: 'android-integration-3.2.1' //zxing
+	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: 'EnhancedListView-0.3.4', ext: 'aar'
     compile name: 'ShortcutBadger-1.1.3', 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: 'android-crop-1.0.1', ext: 'aar'
+    compile name: 'roundedimageview-2.2.0', ext: 'aar'
+    compile name: 'switchbutton-1.2.8', ext: 'aar' // loaded from jcenter
+    compile name: 'openpgp-api-10.0', ext: 'aar' // loaded from jcenter
 
     // Local modules
-    compile project(':libs:openpgp-api-lib')
     compile project(':libs:MemorizingTrustManager')
     compile project(':libs:emojicon')
 	compile project(':libs:colorpicker')
@@ -68,7 +61,7 @@ android {
 		minSdkVersion 14
 		targetSdkVersion 23
 		versionCode 122
-		versionName "1.9.3"
+		versionName "1.9.3.1"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}
 

libs/openpgp-api-lib/build.gradle

@@ -1,35 +0,0 @@
-// please leave this here, so this library builds on its own
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-    }
-}
-
-apply plugin: 'android-library'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1'
-    
-    // NOTE: We are using the old folder structure to also support Eclipse
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-    }
-    
-    // Do not abort build if lint finds errors
-    lintOptions {
-        abortOnError false
-    }
-}

settings.gradle

@@ -2,6 +2,5 @@ include ':libs:MemorizingTrustManager'
 include ':libs:emojicon'
 include ':libs:colorpicker'
 include ':libs:thedevstacklogcat'
-include ':libs:openpgp-api-lib'
 
 rootProject.name = 'Conversations'