From 93750662d20e0126995078dcb2b8ba72718cc4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Mion?= Date: Mon, 5 Oct 2020 18:49:01 +0100 Subject: [PATCH] Upgrade Gradle to 6.1.1 Upgrade build tools to 4.0.1 Target SDK to 30 Upgrade material library version --- README.md | 2 +- build.gradle | 8 ++++---- gradle.properties | 19 +------------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 6a86e96..678c098 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![License Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=true)](http://www.apache.org/licenses/LICENSE-2.0) ![minSdkVersion 19](https://img.shields.io/badge/minSdkVersion-19-red.svg?style=true) -![compileSdkVersion 29](https://img.shields.io/badge/compileSdkVersion-29-yellow.svg?style=true) +![compileSdkVersion 30](https://img.shields.io/badge/compileSdkVersion-30-yellow.svg?style=true) [![maven-central](https://img.shields.io/maven-central/v/com.github.andremion/floatingnavigationview.svg)](https://search.maven.org/#artifactdetails%7Ccom.github.andremion%7Cfloatingnavigationview%7C1.2.0%7Caar) [![Android Arsenal Floating-Navigation-View](https://img.shields.io/badge/Android%20Arsenal-Floating--Navigation--View-green.svg?style=true)](https://android-arsenal.com/details/1/4134) diff --git a/build.gradle b/build.gradle index ed85306..9b0c2f6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.0.1' } } @@ -14,10 +14,10 @@ allprojects { jcenter() } ext { - compileSdkVersion = 29 + compileSdkVersion = 30 minSdkVersion = 19 - targetSdkVersion = 29 - materialDesignVersion = '1.0.0' + targetSdkVersion = 30 + materialDesignVersion = '1.2.1' junitVersion = '4.12' } } diff --git a/gradle.properties b/gradle.properties index 026ff80..bf22c6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,4 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +android.useAndroidX=true VERSION_NAME=1.2.0 VERSION_CODE=5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e471d7a..bf12a44 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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip