aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorpacien2020-01-20 19:23:15 +0100
committerpacien2020-01-20 19:42:34 +0100
commit1292702c5404e519b3733f23ec98cbad925ebcb5 (patch)
treeccaf2644e1ad4ced2b58d5ca1ba37ad0c2b0ed5c /app
parentb04d9581adb3e3176586f31ffdba123125546201 (diff)
downloadtincapp-0.29.tar.gz
release v0.29v0.29
Diffstat (limited to 'app')
-rw-r--r--app/CMakeLists.txt4
-rw-r--r--app/build.gradle10
2 files changed, 7 insertions, 7 deletions
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
54 54
55ExternalProject_Add(tinc 55ExternalProject_Add(tinc
56 DEPENDS lzo libressl 56 DEPENDS lzo libressl
57 URL https://github.com/gsliepen/tinc/archive/6682a0d29cbb70b216a3fe02f2812963dee607d0.tar.gz 57 URL https://github.com/gsliepen/tinc/archive/f5223937e62e1cc5e9b3d322490dd3af8d666750.tar.gz
58 URL_HASH SHA256=ffb0e6c02b0112c095366b3baa89f5ed56cc5f644be40268696ce7741e76452a 58 URL_HASH SHA256=3fe923e8fbb1e0192986039e91d6945ffbbe326ee8c2c0a13bacf80e87dad4a9
59 CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> && 59 CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
60 <SOURCE_DIR>/configure ${xCONFIG} 60 <SOURCE_DIR>/configure ${xCONFIG}
61 --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local 61 --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 {
37 minSdkVersion 21 37 minSdkVersion 21
38 targetSdkVersion 29 38 targetSdkVersion 29
39 multiDexEnabled true 39 multiDexEnabled true
40 versionCode 28 40 versionCode 29
41 versionName '0.28' 41 versionName '0.29'
42 ndk { 42 ndk {
43 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' 43 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
44 } 44 }
@@ -85,9 +85,9 @@ dependencies {
85 implementation 'org.slf4j:slf4j-api:1.7.26' 85 implementation 'org.slf4j:slf4j-api:1.7.26'
86 implementation 'com.github.tony19:logback-android:2.0.0' 86 implementation 'com.github.tony19:logback-android:2.0.0'
87 // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 87 // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24
88 implementation 'org.apache.commons:commons-configuration2:2.3' 88 implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' }
89 implementation 'commons-beanutils:commons-beanutils:1.9.3' 89 implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' }
90 implementation 'commons-io:commons-io:2.6' 90 implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' }
91} 91}
92 92
93repositories { 93repositories {