diff options
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/app/build.gradle b/app/build.gradle index d38b0ac..03d5fc1 100644 --- a/app/build.gradle +++ b/app/build.gradle | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2021 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2024 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -30,15 +30,15 @@ def keystoreProperties = new Properties() | |||
30 | if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) | 30 | if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) |
31 | 31 | ||
32 | android { | 32 | android { |
33 | compileSdkVersion 30 | 33 | compileSdkVersion 33 |
34 | 34 | ||
35 | defaultConfig { | 35 | defaultConfig { |
36 | applicationId 'org.pacien.tincapp' | 36 | applicationId 'org.pacien.tincapp' |
37 | minSdkVersion 21 | 37 | minSdkVersion 21 |
38 | targetSdkVersion 30 | 38 | targetSdkVersion 33 |
39 | multiDexEnabled true | 39 | multiDexEnabled true |
40 | versionCode 32 | 40 | versionCode 39 |
41 | versionName '0.32' | 41 | versionName '0.39' |
42 | ndk { | 42 | ndk { |
43 | abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' | 43 | abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' |
44 | } | 44 | } |
@@ -71,13 +71,7 @@ android { | |||
71 | dataBinding = true | 71 | dataBinding = true |
72 | } | 72 | } |
73 | 73 | ||
74 | packagingOptions { | 74 | namespace 'org.pacien.tincapp' |
75 | // clashing in dependencies (Apache Mina FtpServer) | ||
76 | exclude 'META-INF/DEPENDENCIES' | ||
77 | exclude 'META-INF/spring.schemas' | ||
78 | exclude 'META-INF/spring.handlers' | ||
79 | exclude 'META-INF/license.txt' | ||
80 | } | ||
81 | } | 75 | } |
82 | 76 | ||
83 | dependencies { | 77 | dependencies { |
@@ -96,7 +90,6 @@ dependencies { | |||
96 | implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' } | 90 | implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' } |
97 | implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } | 91 | implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } |
98 | implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' } | 92 | implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' } |
99 | implementation('org.apache.ftpserver:ftpserver:1.1.1') { exclude group: 'org.slf4j', module: 'slf4j-log4j12' } | ||
100 | } | 93 | } |
101 | 94 | ||
102 | repositories { | 95 | repositories { |