From 9cb2ed335610974d51ce76df552343dfc7533e95 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Sat, 17 Apr 2021 14:32:04 +0200
Subject: [PATCH] Update gradle plugin and androidxcore
We need core at 1.5.0-rc01 to be able to clearActions()
---
build.gradle | 2 +-
dependencies.gradle | 6 ++++--
ultrasonic/build.gradle | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8f012662..96f03ef1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
- classpath gradlePlugins.androidTools
+ classpath gradlePlugins.gradle
classpath gradlePlugins.kotlin
classpath gradlePlugins.ktlintGradle
classpath gradlePlugins.detekt
diff --git a/dependencies.gradle b/dependencies.gradle
index 8f84cf07..907d1699 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -5,7 +5,8 @@ ext.versions = [
gradle : '6.5',
navigation : "2.3.2",
- androidTools : "4.0.0",
+ gradlePlugin : "4.1.2",
+ androidxcore : "1.5.0-rc01",
ktlint : "0.37.1",
ktlintGradle : "9.2.1",
detekt : "1.0.0.RC6-4",
@@ -44,7 +45,7 @@ ext.versions = [
]
ext.gradlePlugins = [
- androidTools : "com.android.tools.build:gradle:$versions.androidTools",
+ gradle : "com.android.tools.build:gradle:$versions.gradlePlugin",
kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin",
ktlintGradle : "org.jlleitschuh.gradle:ktlint-gradle:$versions.ktlintGradle",
detekt : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$versions.detekt",
@@ -52,6 +53,7 @@ ext.gradlePlugins = [
]
ext.androidSupport = [
+ core : "androidx.core:core-ktx:$versions.androidxcore",
support : "androidx.legacy:legacy-support-v4:$versions.androidLegacySupport",
design : "com.google.android.material:material:$versions.androidSupportDesign",
annotations : "com.android.support:support-annotations:$versions.androidSupport",
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index a1a1b99d..ec595e98 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -71,6 +71,7 @@ dependencies {
implementation project(':core:subsonic-api-image-loader')
implementation project(':core:cache')
+ implementation androidSupport.core
implementation androidSupport.support
implementation androidSupport.design
implementation androidSupport.multidex