From e104556bd46822254afc85c67f01f8f3474cc009 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 24 Mar 2019 21:54:48 +0100 Subject: update dependencies --- app/build.gradle | 26 ++++++++++++++------------ 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 @@ /* * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon - * Copyright (C) 2017-2018 Pacien TRAN-GIRARD + * Copyright (C) 2017-2019 Pacien TRAN-GIRARD * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,11 +16,13 @@ * along with this program. If not, see . */ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'com.github.triplet.play' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'com.github.triplet.play' version '2.1.0' +} def keystorePropertiesFile = rootProject.file("keystore.properties") def keystoreAvailable = keystorePropertiesFile.exists() @@ -75,14 +77,14 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.3' - implementation "android.arch.lifecycle:extensions:1.1.1" - implementation "com.android.support:support-compat:27.1.1" + implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' + implementation 'android.arch.lifecycle:extensions:1.1.1' + implementation 'com.android.support:support-compat:27.1.1' implementation 'com.android.support:design:27.1.1' implementation 'com.journeyapps:zxing-android-embedded:3.6.0' - implementation 'org.bouncycastle:bcpkix-jdk15on:1.60' - implementation 'org.slf4j:slf4j-api:1.7.25' - implementation 'com.github.tony19:logback-android:1.3.0-2' + implementation 'org.bouncycastle:bcpkix-jdk15on:1.61' + 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') { exclude group: 'commons-logging', module: 'commons-logging' } 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 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.20' + ext.kotlin_version = '1.3.21' repositories { jcenter() @@ -27,9 +27,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath("com.github.triplet.gradle:play-publisher:2.0.0-beta1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files -- cgit v1.2.3