summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2018-11-10 12:52:06 +0100
committerpacien2018-11-10 12:52:06 +0100
commit38b58106af2c5cce5aa24b4a1c31a3ceaa2b9212 (patch)
tree9318a90af72642efd49bfbb705de94d06bcd0106
parent028fcfa6448f0bd4fe623a53d99ff3bcf4627d7c (diff)
downloadtincapp-38b58106af2c5cce5aa24b4a1c31a3ceaa2b9212.tar.gz
Update libraries
-rw-r--r--app/CMakeLists.txt4
-rw-r--r--app/build.gradle8
2 files changed, 6 insertions, 6 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ce018e1..13496d4 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -43,8 +43,8 @@ ExternalProject_Add(lzo
43) 43)
44 44
45ExternalProject_Add(libressl 45ExternalProject_Add(libressl
46 URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.4.tar.gz 46 URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.2.tar.gz
47 URL_HASH SHA256=1e3a9fada06c1c060011470ad0ff960de28f9a0515277d7336f7e09362517da6 47 URL_HASH SHA256=b8cb31e59f1294557bfc80f2a662969bc064e83006ceef0574e2553a1c254fd5
48 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared 48 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
49 BUILD_COMMAND make -j8 -C crypto 49 BUILD_COMMAND make -j8 -C crypto
50 INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && 50 INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
diff --git a/app/build.gradle b/app/build.gradle
index 92ff42c..6f5180f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,11 +80,11 @@ dependencies {
80 implementation "com.android.support:support-compat:27.1.1" 80 implementation "com.android.support:support-compat:27.1.1"
81 implementation 'com.android.support:design:27.1.1' 81 implementation 'com.android.support:design:27.1.1'
82 implementation 'com.journeyapps:zxing-android-embedded:3.6.0' 82 implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
83 implementation 'org.bouncycastle:bcpkix-jdk15on:1.59' 83 implementation 'org.bouncycastle:bcpkix-jdk15on:1.60'
84 implementation 'org.slf4j:slf4j-api:1.7.25' 84 implementation 'org.slf4j:slf4j-api:1.7.25'
85 //noinspection GradleDependency: inspection tool bug for logback-android 85 implementation 'com.github.tony19:logback-android:1.3.0-2'
86 implementation 'com.github.tony19:logback-android:1.1.1-12' 86 // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24
87 implementation('org.apache.commons:commons-configuration2:2.2') { exclude group: 'commons-logging', module: 'commons-logging' } 87 implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' }
88 implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } 88 implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' }
89 implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' } 89 implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' }
90} 90}