From 1292702c5404e519b3733f23ec98cbad925ebcb5 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 20 Jan 2020 19:23:15 +0100
Subject: release v0.29

---
 app/CMakeLists.txt |  4 ++--
 app/build.gradle   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6449aeb..150e37f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -54,8 +54,8 @@ ExternalProject_Add(libressl
 
 ExternalProject_Add(tinc
   DEPENDS           lzo libressl
-  URL               https://github.com/gsliepen/tinc/archive/6682a0d29cbb70b216a3fe02f2812963dee607d0.tar.gz
-  URL_HASH          SHA256=ffb0e6c02b0112c095366b3baa89f5ed56cc5f644be40268696ce7741e76452a
+  URL               https://github.com/gsliepen/tinc/archive/f5223937e62e1cc5e9b3d322490dd3af8d666750.tar.gz
+  URL_HASH          SHA256=3fe923e8fbb1e0192986039e91d6945ffbbe326ee8c2c0a13bacf80e87dad4a9
   CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
                     <SOURCE_DIR>/configure ${xCONFIG}
                       --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
diff --git a/app/build.gradle b/app/build.gradle
index 25e449e..44e5e8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
     minSdkVersion 21
     targetSdkVersion 29
     multiDexEnabled true
-    versionCode 28
-    versionName '0.28'
+    versionCode 29
+    versionName '0.29'
     ndk {
       abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
     }
@@ -85,9 +85,9 @@ dependencies {
   implementation 'org.slf4j:slf4j-api:1.7.26'
   implementation 'com.github.tony19:logback-android:2.0.0'
   // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24
-  implementation 'org.apache.commons:commons-configuration2:2.3'
-  implementation 'commons-beanutils:commons-beanutils:1.9.3'
-  implementation 'commons-io:commons-io:2.6'
+  implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' }
+  implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' }
+  implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' }
 }
 
 repositories {
-- 
cgit v1.2.3