From 306fdd8938230e1ea72e3bfeafafe3a700145946 Mon Sep 17 00:00:00 2001 From: Herbert Reiter <4941275-moasda@users.noreply.gitlab.com> Date: Tue, 8 Sep 2020 22:43:28 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle | 10 +++++----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c16284a..92298f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.moasdawiki.app" minSdkVersion 26 // 26 = Oreo 8.0 targetSdkVersion 29 // should be same as compileSdkVersion - versionCode 16 - versionName "2.2.1.0" + versionCode 17 + versionName "2.2.1.1" archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode } sourceSets { @@ -26,8 +26,8 @@ android { dependencies { implementation 'net.moasdawiki:moasdawiki-server:2.2.0' implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.preference:preference:1.1.0' - compileOnly 'org.jetbrains:annotations:18.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.preference:preference:1.1.1' + compileOnly 'org.jetbrains:annotations:19.0.0' testImplementation 'org.testng:testng:6.14.3' } diff --git a/build.gradle b/build.gradle index a7cc310..40a8eeb 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e8fb34..d4412b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 15 11:51:27 CET 2020 +#Tue Sep 08 22:17:23 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip