diff options
-rw-r--r-- | app/build.gradle | 26 | ||||
-rw-r--r-- | build.gradle | 5 |
2 files changed, 16 insertions, 15 deletions
diff --git a/app/build.gradle b/app/build.gradle index 864f9ad..937a1f6 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-2018 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2019 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 |
@@ -16,11 +16,13 @@ | |||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | apply plugin: 'com.android.application' | 19 | plugins { |
20 | apply plugin: 'kotlin-android' | 20 | id 'com.android.application' |
21 | apply plugin: 'kotlin-android-extensions' | 21 | id 'kotlin-android' |
22 | apply plugin: 'kotlin-kapt' | 22 | id 'kotlin-android-extensions' |
23 | apply plugin: 'com.github.triplet.play' | 23 | id 'kotlin-kapt' |
24 | id 'com.github.triplet.play' version '2.1.0' | ||
25 | } | ||
24 | 26 | ||
25 | def keystorePropertiesFile = rootProject.file("keystore.properties") | 27 | def keystorePropertiesFile = rootProject.file("keystore.properties") |
26 | def keystoreAvailable = keystorePropertiesFile.exists() | 28 | def keystoreAvailable = keystorePropertiesFile.exists() |
@@ -75,14 +77,14 @@ dependencies { | |||
75 | implementation fileTree(dir: 'libs', include: ['*.jar']) | 77 | implementation fileTree(dir: 'libs', include: ['*.jar']) |
76 | 78 | ||
77 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | 79 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
78 | implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.3' | 80 | implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' |
79 | implementation "android.arch.lifecycle:extensions:1.1.1" | 81 | implementation 'android.arch.lifecycle:extensions:1.1.1' |
80 | implementation "com.android.support:support-compat:27.1.1" | 82 | implementation 'com.android.support:support-compat:27.1.1' |
81 | implementation 'com.android.support:design:27.1.1' | 83 | implementation 'com.android.support:design:27.1.1' |
82 | implementation 'com.journeyapps:zxing-android-embedded:3.6.0' | 84 | implementation 'com.journeyapps:zxing-android-embedded:3.6.0' |
83 | implementation 'org.bouncycastle:bcpkix-jdk15on:1.60' | 85 | implementation 'org.bouncycastle:bcpkix-jdk15on:1.61' |
84 | implementation 'org.slf4j:slf4j-api:1.7.25' | 86 | implementation 'org.slf4j:slf4j-api:1.7.26' |
85 | implementation 'com.github.tony19:logback-android:1.3.0-2' | 87 | implementation 'com.github.tony19:logback-android:2.0.0' |
86 | // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 | 88 | // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 |
87 | implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' } | 89 | 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' } | 90 | implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } |
diff --git a/build.gradle b/build.gradle index ba1ef5b..1e1bf83 100644 --- a/build.gradle +++ b/build.gradle | |||
@@ -19,7 +19,7 @@ | |||
19 | // Top-level build file where you can add configuration options common to all sub-projects/modules. | 19 | // Top-level build file where you can add configuration options common to all sub-projects/modules. |
20 | 20 | ||
21 | buildscript { | 21 | buildscript { |
22 | ext.kotlin_version = '1.3.20' | 22 | ext.kotlin_version = '1.3.21' |
23 | 23 | ||
24 | repositories { | 24 | repositories { |
25 | jcenter() | 25 | jcenter() |
@@ -27,9 +27,8 @@ buildscript { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | dependencies { | 29 | dependencies { |
30 | classpath 'com.android.tools.build:gradle:3.3.1' | 30 | classpath 'com.android.tools.build:gradle:3.3.2' |
31 | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | 31 | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" |
32 | classpath("com.github.triplet.gradle:play-publisher:2.0.0-beta1") | ||
33 | 32 | ||
34 | // NOTE: Do not place your application dependencies here; they belong | 33 | // NOTE: Do not place your application dependencies here; they belong |
35 | // in the individual module build.gradle files | 34 | // in the individual module build.gradle files |