From f7abd4237f0b8441fcba45459e26b8a0ea1d36de Mon Sep 17 00:00:00 2001 From: steckbrief Date: Thu, 11 Feb 2016 21:20:06 +0100 Subject: Fixed third party library references in gradle --- build.gradle | 29 +++++++---------- libs/3rdParty/EnhancedListView-0.3.4.aar | Bin 40155 -> 0 bytes libs/3rdParty/ShortcutBadger-1.1.1.aar | Bin 16916 -> 0 bytes libs/3rdParty/bcprov-jdk15on-1.51.jar | Bin 2842667 -> 0 bytes libs/3rdParty/jcenter/openpgp-api-10.0.aar | Bin 0 -> 66002 bytes libs/3rdParty/jcenter/switchbutton-1.2.8.aar | Bin 0 -> 52299 bytes libs/3rdParty/libidn-1.15.jar | Bin 111731 -> 0 bytes libs/3rdParty/maven/EnhancedListView-0.3.4.aar | Bin 0 -> 40155 bytes libs/3rdParty/maven/ShortcutBadger-1.1.3.aar | Bin 0 -> 16993 bytes libs/3rdParty/maven/android-crop-1.0.1.aar | Bin 0 -> 62576 bytes libs/3rdParty/maven/axolotl-android-1.3.4.aar | Bin 0 -> 2368 bytes .../maven/axolotl-curve25519-android-0.2.4.aar | Bin 0 -> 371365 bytes libs/3rdParty/maven/axolotl-java-1.3.4.jar | Bin 0 -> 334671 bytes libs/3rdParty/maven/bcmail-jdk15on-1.52.jar | Bin 0 -> 98208 bytes libs/3rdParty/maven/bcprov-jdk15on-1.52.jar | Bin 0 -> 2902942 bytes libs/3rdParty/maven/libidn-1.15.jar | Bin 0 -> 111731 bytes libs/3rdParty/maven/minidns-0.1.7.jar | Bin 0 -> 33233 bytes libs/3rdParty/maven/org.otr4j-0.22.jar | Bin 0 -> 105376 bytes libs/3rdParty/maven/roundedimageview-2.2.0.aar | Bin 0 -> 20836 bytes libs/3rdParty/maven/swipy-1.2.1.aar | Bin 0 -> 48375 bytes libs/3rdParty/maven/zxing-android-core-3.2.1.jar | Bin 0 -> 11473 bytes .../maven/zxing-android-integration-3.2.1.jar | Bin 0 -> 11250 bytes libs/3rdParty/maven/zxing-core-3.2.1.jar | Bin 0 -> 544403 bytes libs/3rdParty/minidns-0.1.3.jar | Bin 31043 -> 0 bytes libs/3rdParty/org.otr4j-0.22.jar | Bin 105376 -> 0 bytes libs/3rdParty/swipy-1.2.1.aar | Bin 48375 -> 0 bytes libs/3rdParty/zxing/android-core-3.1.0.jar | Bin 11415 -> 0 bytes libs/3rdParty/zxing/android-integration-3.1.0.jar | Bin 11171 -> 0 bytes libs/3rdParty/zxing/core-3.1.0.jar | Bin 538421 -> 0 bytes libs/openpgp-api-lib/build.gradle | 35 --------------------- settings.gradle | 1 - 31 files changed, 11 insertions(+), 54 deletions(-) delete mode 100644 libs/3rdParty/EnhancedListView-0.3.4.aar delete mode 100644 libs/3rdParty/ShortcutBadger-1.1.1.aar delete mode 100644 libs/3rdParty/bcprov-jdk15on-1.51.jar create mode 100644 libs/3rdParty/jcenter/openpgp-api-10.0.aar create mode 100644 libs/3rdParty/jcenter/switchbutton-1.2.8.aar delete mode 100644 libs/3rdParty/libidn-1.15.jar create mode 100644 libs/3rdParty/maven/EnhancedListView-0.3.4.aar create mode 100644 libs/3rdParty/maven/ShortcutBadger-1.1.3.aar create mode 100644 libs/3rdParty/maven/android-crop-1.0.1.aar create mode 100644 libs/3rdParty/maven/axolotl-android-1.3.4.aar create mode 100644 libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar create mode 100644 libs/3rdParty/maven/axolotl-java-1.3.4.jar create mode 100644 libs/3rdParty/maven/bcmail-jdk15on-1.52.jar create mode 100644 libs/3rdParty/maven/bcprov-jdk15on-1.52.jar create mode 100644 libs/3rdParty/maven/libidn-1.15.jar create mode 100644 libs/3rdParty/maven/minidns-0.1.7.jar create mode 100644 libs/3rdParty/maven/org.otr4j-0.22.jar create mode 100644 libs/3rdParty/maven/roundedimageview-2.2.0.aar create mode 100644 libs/3rdParty/maven/swipy-1.2.1.aar create mode 100644 libs/3rdParty/maven/zxing-android-core-3.2.1.jar create mode 100644 libs/3rdParty/maven/zxing-android-integration-3.2.1.jar create mode 100644 libs/3rdParty/maven/zxing-core-3.2.1.jar delete mode 100644 libs/3rdParty/minidns-0.1.3.jar delete mode 100644 libs/3rdParty/org.otr4j-0.22.jar delete mode 100644 libs/3rdParty/swipy-1.2.1.aar delete mode 100644 libs/3rdParty/zxing/android-core-3.1.0.jar delete mode 100644 libs/3rdParty/zxing/android-integration-3.1.0.jar delete mode 100644 libs/3rdParty/zxing/core-3.1.0.jar delete mode 100644 libs/openpgp-api-lib/build.gradle diff --git a/build.gradle b/build.gradle index 5e5f9b07..440c3cbb 100644 --- a/build.gradle +++ b/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); } diff --git a/libs/3rdParty/EnhancedListView-0.3.4.aar b/libs/3rdParty/EnhancedListView-0.3.4.aar deleted file mode 100644 index 1d649e4f..00000000 Binary files a/libs/3rdParty/EnhancedListView-0.3.4.aar and /dev/null differ diff --git a/libs/3rdParty/ShortcutBadger-1.1.1.aar b/libs/3rdParty/ShortcutBadger-1.1.1.aar deleted file mode 100644 index becd4961..00000000 Binary files a/libs/3rdParty/ShortcutBadger-1.1.1.aar and /dev/null differ diff --git a/libs/3rdParty/bcprov-jdk15on-1.51.jar b/libs/3rdParty/bcprov-jdk15on-1.51.jar deleted file mode 100644 index 4076e116..00000000 Binary files a/libs/3rdParty/bcprov-jdk15on-1.51.jar and /dev/null differ diff --git a/libs/3rdParty/jcenter/openpgp-api-10.0.aar b/libs/3rdParty/jcenter/openpgp-api-10.0.aar new file mode 100644 index 00000000..68aa1d07 Binary files /dev/null and b/libs/3rdParty/jcenter/openpgp-api-10.0.aar differ diff --git a/libs/3rdParty/jcenter/switchbutton-1.2.8.aar b/libs/3rdParty/jcenter/switchbutton-1.2.8.aar new file mode 100644 index 00000000..de61848d Binary files /dev/null and b/libs/3rdParty/jcenter/switchbutton-1.2.8.aar differ diff --git a/libs/3rdParty/libidn-1.15.jar b/libs/3rdParty/libidn-1.15.jar deleted file mode 100644 index 79a44f92..00000000 Binary files a/libs/3rdParty/libidn-1.15.jar and /dev/null differ diff --git a/libs/3rdParty/maven/EnhancedListView-0.3.4.aar b/libs/3rdParty/maven/EnhancedListView-0.3.4.aar new file mode 100644 index 00000000..1d649e4f Binary files /dev/null and b/libs/3rdParty/maven/EnhancedListView-0.3.4.aar differ diff --git a/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar b/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar new file mode 100644 index 00000000..fbf939ed Binary files /dev/null and b/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar differ diff --git a/libs/3rdParty/maven/android-crop-1.0.1.aar b/libs/3rdParty/maven/android-crop-1.0.1.aar new file mode 100644 index 00000000..2f42f762 Binary files /dev/null and b/libs/3rdParty/maven/android-crop-1.0.1.aar differ diff --git a/libs/3rdParty/maven/axolotl-android-1.3.4.aar b/libs/3rdParty/maven/axolotl-android-1.3.4.aar new file mode 100644 index 00000000..f1ee4f0e Binary files /dev/null and b/libs/3rdParty/maven/axolotl-android-1.3.4.aar differ diff --git a/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar b/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar new file mode 100644 index 00000000..98c34058 Binary files /dev/null and b/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar differ diff --git a/libs/3rdParty/maven/axolotl-java-1.3.4.jar b/libs/3rdParty/maven/axolotl-java-1.3.4.jar new file mode 100644 index 00000000..d8402ad6 Binary files /dev/null and b/libs/3rdParty/maven/axolotl-java-1.3.4.jar differ diff --git a/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar b/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar new file mode 100644 index 00000000..3e1cbe5b Binary files /dev/null and b/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar differ diff --git a/libs/3rdParty/maven/bcprov-jdk15on-1.52.jar b/libs/3rdParty/maven/bcprov-jdk15on-1.52.jar new file mode 100644 index 00000000..6c54dd90 Binary files /dev/null and b/libs/3rdParty/maven/bcprov-jdk15on-1.52.jar differ diff --git a/libs/3rdParty/maven/libidn-1.15.jar b/libs/3rdParty/maven/libidn-1.15.jar new file mode 100644 index 00000000..79a44f92 Binary files /dev/null and b/libs/3rdParty/maven/libidn-1.15.jar differ diff --git a/libs/3rdParty/maven/minidns-0.1.7.jar b/libs/3rdParty/maven/minidns-0.1.7.jar new file mode 100644 index 00000000..c0121eca Binary files /dev/null and b/libs/3rdParty/maven/minidns-0.1.7.jar differ diff --git a/libs/3rdParty/maven/org.otr4j-0.22.jar b/libs/3rdParty/maven/org.otr4j-0.22.jar new file mode 100644 index 00000000..f217db1d Binary files /dev/null and b/libs/3rdParty/maven/org.otr4j-0.22.jar differ diff --git a/libs/3rdParty/maven/roundedimageview-2.2.0.aar b/libs/3rdParty/maven/roundedimageview-2.2.0.aar new file mode 100644 index 00000000..1fa43751 Binary files /dev/null and b/libs/3rdParty/maven/roundedimageview-2.2.0.aar differ diff --git a/libs/3rdParty/maven/swipy-1.2.1.aar b/libs/3rdParty/maven/swipy-1.2.1.aar new file mode 100644 index 00000000..428e97db Binary files /dev/null and b/libs/3rdParty/maven/swipy-1.2.1.aar differ diff --git a/libs/3rdParty/maven/zxing-android-core-3.2.1.jar b/libs/3rdParty/maven/zxing-android-core-3.2.1.jar new file mode 100644 index 00000000..64a60e68 Binary files /dev/null and b/libs/3rdParty/maven/zxing-android-core-3.2.1.jar differ diff --git a/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar b/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar new file mode 100644 index 00000000..5015e211 Binary files /dev/null and b/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar differ diff --git a/libs/3rdParty/maven/zxing-core-3.2.1.jar b/libs/3rdParty/maven/zxing-core-3.2.1.jar new file mode 100644 index 00000000..05d7cda7 Binary files /dev/null and b/libs/3rdParty/maven/zxing-core-3.2.1.jar differ diff --git a/libs/3rdParty/minidns-0.1.3.jar b/libs/3rdParty/minidns-0.1.3.jar deleted file mode 100644 index d8e74660..00000000 Binary files a/libs/3rdParty/minidns-0.1.3.jar and /dev/null differ diff --git a/libs/3rdParty/org.otr4j-0.22.jar b/libs/3rdParty/org.otr4j-0.22.jar deleted file mode 100644 index f217db1d..00000000 Binary files a/libs/3rdParty/org.otr4j-0.22.jar and /dev/null differ diff --git a/libs/3rdParty/swipy-1.2.1.aar b/libs/3rdParty/swipy-1.2.1.aar deleted file mode 100644 index 428e97db..00000000 Binary files a/libs/3rdParty/swipy-1.2.1.aar and /dev/null differ diff --git a/libs/3rdParty/zxing/android-core-3.1.0.jar b/libs/3rdParty/zxing/android-core-3.1.0.jar deleted file mode 100644 index 0c6137de..00000000 Binary files a/libs/3rdParty/zxing/android-core-3.1.0.jar and /dev/null differ diff --git a/libs/3rdParty/zxing/android-integration-3.1.0.jar b/libs/3rdParty/zxing/android-integration-3.1.0.jar deleted file mode 100644 index fb621f8b..00000000 Binary files a/libs/3rdParty/zxing/android-integration-3.1.0.jar and /dev/null differ diff --git a/libs/3rdParty/zxing/core-3.1.0.jar b/libs/3rdParty/zxing/core-3.1.0.jar deleted file mode 100644 index 63c228a9..00000000 Binary files a/libs/3rdParty/zxing/core-3.1.0.jar and /dev/null differ diff --git a/libs/openpgp-api-lib/build.gradle b/libs/openpgp-api-lib/build.gradle deleted file mode 100644 index a991cf26..00000000 --- a/libs/openpgp-api-lib/build.gradle +++ /dev/null @@ -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 - } -} diff --git a/settings.gradle b/settings.gradle index 56c11345..73640267 100644 --- a/settings.gradle +++ b/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' -- cgit v1.2.3