diff options
26 files changed, 11 insertions, 54 deletions
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/ShortcutBadger-1.1.1.aar b/libs/3rdParty/ShortcutBadger-1.1.1.aar Binary files differdeleted file mode 100644 index becd4961..00000000 --- a/libs/3rdParty/ShortcutBadger-1.1.1.aar +++ /dev/null diff --git a/libs/3rdParty/jcenter/openpgp-api-10.0.aar b/libs/3rdParty/jcenter/openpgp-api-10.0.aar Binary files differnew file mode 100644 index 00000000..68aa1d07 --- /dev/null +++ b/libs/3rdParty/jcenter/openpgp-api-10.0.aar diff --git a/libs/3rdParty/jcenter/switchbutton-1.2.8.aar b/libs/3rdParty/jcenter/switchbutton-1.2.8.aar Binary files differnew file mode 100644 index 00000000..de61848d --- /dev/null +++ b/libs/3rdParty/jcenter/switchbutton-1.2.8.aar diff --git a/libs/3rdParty/EnhancedListView-0.3.4.aar b/libs/3rdParty/maven/EnhancedListView-0.3.4.aar Binary files differindex 1d649e4f..1d649e4f 100644 --- a/libs/3rdParty/EnhancedListView-0.3.4.aar +++ b/libs/3rdParty/maven/EnhancedListView-0.3.4.aar diff --git a/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar b/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar Binary files differnew file mode 100644 index 00000000..fbf939ed --- /dev/null +++ b/libs/3rdParty/maven/ShortcutBadger-1.1.3.aar diff --git a/libs/3rdParty/maven/android-crop-1.0.1.aar b/libs/3rdParty/maven/android-crop-1.0.1.aar Binary files differnew file mode 100644 index 00000000..2f42f762 --- /dev/null +++ b/libs/3rdParty/maven/android-crop-1.0.1.aar diff --git a/libs/3rdParty/maven/axolotl-android-1.3.4.aar b/libs/3rdParty/maven/axolotl-android-1.3.4.aar Binary files differnew file mode 100644 index 00000000..f1ee4f0e --- /dev/null +++ b/libs/3rdParty/maven/axolotl-android-1.3.4.aar diff --git a/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar b/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar Binary files differnew file mode 100644 index 00000000..98c34058 --- /dev/null +++ b/libs/3rdParty/maven/axolotl-curve25519-android-0.2.4.aar diff --git a/libs/3rdParty/maven/axolotl-java-1.3.4.jar b/libs/3rdParty/maven/axolotl-java-1.3.4.jar Binary files differnew file mode 100644 index 00000000..d8402ad6 --- /dev/null +++ b/libs/3rdParty/maven/axolotl-java-1.3.4.jar diff --git a/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar b/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar Binary files differnew file mode 100644 index 00000000..3e1cbe5b --- /dev/null +++ b/libs/3rdParty/maven/bcmail-jdk15on-1.52.jar diff --git a/libs/3rdParty/bcprov-jdk15on-1.51.jar b/libs/3rdParty/maven/bcprov-jdk15on-1.52.jar Binary files differindex 4076e116..6c54dd90 100644 --- a/libs/3rdParty/bcprov-jdk15on-1.51.jar +++ b/libs/3rdParty/maven/bcprov-jdk15on-1.52.jar diff --git a/libs/3rdParty/libidn-1.15.jar b/libs/3rdParty/maven/libidn-1.15.jar Binary files differindex 79a44f92..79a44f92 100644 --- a/libs/3rdParty/libidn-1.15.jar +++ b/libs/3rdParty/maven/libidn-1.15.jar diff --git a/libs/3rdParty/maven/minidns-0.1.7.jar b/libs/3rdParty/maven/minidns-0.1.7.jar Binary files differnew file mode 100644 index 00000000..c0121eca --- /dev/null +++ b/libs/3rdParty/maven/minidns-0.1.7.jar diff --git a/libs/3rdParty/org.otr4j-0.22.jar b/libs/3rdParty/maven/org.otr4j-0.22.jar Binary files differindex f217db1d..f217db1d 100644 --- a/libs/3rdParty/org.otr4j-0.22.jar +++ b/libs/3rdParty/maven/org.otr4j-0.22.jar diff --git a/libs/3rdParty/maven/roundedimageview-2.2.0.aar b/libs/3rdParty/maven/roundedimageview-2.2.0.aar Binary files differnew file mode 100644 index 00000000..1fa43751 --- /dev/null +++ b/libs/3rdParty/maven/roundedimageview-2.2.0.aar diff --git a/libs/3rdParty/swipy-1.2.1.aar b/libs/3rdParty/maven/swipy-1.2.1.aar Binary files differindex 428e97db..428e97db 100644 --- a/libs/3rdParty/swipy-1.2.1.aar +++ b/libs/3rdParty/maven/swipy-1.2.1.aar diff --git a/libs/3rdParty/maven/zxing-android-core-3.2.1.jar b/libs/3rdParty/maven/zxing-android-core-3.2.1.jar Binary files differnew file mode 100644 index 00000000..64a60e68 --- /dev/null +++ b/libs/3rdParty/maven/zxing-android-core-3.2.1.jar diff --git a/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar b/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar Binary files differnew file mode 100644 index 00000000..5015e211 --- /dev/null +++ b/libs/3rdParty/maven/zxing-android-integration-3.2.1.jar diff --git a/libs/3rdParty/maven/zxing-core-3.2.1.jar b/libs/3rdParty/maven/zxing-core-3.2.1.jar Binary files differnew file mode 100644 index 00000000..05d7cda7 --- /dev/null +++ b/libs/3rdParty/maven/zxing-core-3.2.1.jar diff --git a/libs/3rdParty/minidns-0.1.3.jar b/libs/3rdParty/minidns-0.1.3.jar Binary files differdeleted file mode 100644 index d8e74660..00000000 --- a/libs/3rdParty/minidns-0.1.3.jar +++ /dev/null diff --git a/libs/3rdParty/zxing/android-core-3.1.0.jar b/libs/3rdParty/zxing/android-core-3.1.0.jar Binary files differdeleted file mode 100644 index 0c6137de..00000000 --- a/libs/3rdParty/zxing/android-core-3.1.0.jar +++ /dev/null diff --git a/libs/3rdParty/zxing/android-integration-3.1.0.jar b/libs/3rdParty/zxing/android-integration-3.1.0.jar Binary files differdeleted file mode 100644 index fb621f8b..00000000 --- a/libs/3rdParty/zxing/android-integration-3.1.0.jar +++ /dev/null diff --git a/libs/3rdParty/zxing/core-3.1.0.jar b/libs/3rdParty/zxing/core-3.1.0.jar Binary files differdeleted file mode 100644 index 63c228a9..00000000 --- a/libs/3rdParty/zxing/core-3.1.0.jar +++ /dev/null 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' |