From 8d36a6c613d49f414218201e41c573f46a95a770 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 30 May 2020 20:01:15 +0200 Subject: [PATCH] update gradle and some submodule build versions --- extern/openpgp-api-lib | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- sshauthentication-api/build.gradle | 13 ++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index 3d77d9418..72896baa4 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit 3d77d941868e81ac2a5d6317c24a3df6739e187a +Subproject commit 72896baa40918830a66a24c2616fb3bcbb4bfddd diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 721ad9dfe..bbc20be83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip diff --git a/sshauthentication-api/build.gradle b/sshauthentication-api/build.gradle index 0969a3f71..3ea2689fd 100644 --- a/sshauthentication-api/build.gradle +++ b/sshauthentication-api/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.novoda:bintray-release:0.8.0' } } @@ -16,18 +16,13 @@ android { if (project.hasProperty('rootProject.ext.compileSdkVersion')) { compileSdkVersion rootProject.ext.compileSdkVersion } else { - compileSdkVersion 27 - } - if (project.hasProperty('rootProject.ext.buildToolsVersion')) { - buildToolsVersion rootProject.ext.buildToolsVersion - } else { - buildToolsVersion '27.0.3' + compileSdkVersion 28 } defaultConfig { - minSdkVersion 9 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 1 versionName "1.0" }