From bb8d874eb0fe53b5a65d41370b7cb2d7e1cffb3f Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 14 Jun 2020 11:49:28 -0700 Subject: [PATCH] Upgrade to Android Studio 4.0 and related tooling. --- src/musikdroid/app/build.gradle | 12 ++++++------ src/musikdroid/build.gradle | 6 +++--- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle index 7aaf361dc..24becc682 100644 --- a/src/musikdroid/app/build.gradle +++ b/src/musikdroid/app/build.gradle @@ -12,12 +12,12 @@ apply plugin: 'kotlin-kapt' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "io.casey.musikcube.remote" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 106 versionName "0.92.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -61,9 +61,9 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.google.firebase:firebase-analytics:17.4.2' - implementation 'com.google.firebase:firebase-core:17.4.2' - implementation 'com.google.firebase:firebase-crashlytics:17.0.0' + implementation 'com.google.firebase:firebase-analytics:17.4.3' + implementation 'com.google.firebase:firebase-core:17.4.3' + implementation 'com.google.firebase:firebase-crashlytics:17.0.1' implementation(name:'android-taskrunner-0.5', ext:'aar') implementation(name:'exoplayer-extension-flac-release-v2', ext:'aar') @@ -97,7 +97,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha06' + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'androidx.media:media:1.1.0' testImplementation 'junit:junit:4.12' diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle index e40bebc09..2158c9876 100644 --- a/src/musikdroid/build.gradle +++ b/src/musikdroid/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.3.72' repositories { google() @@ -7,10 +7,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1' } } diff --git a/src/musikdroid/gradle/wrapper/gradle-wrapper.properties b/src/musikdroid/gradle/wrapper/gradle-wrapper.properties index 3d8ea3ccd..86e6dcdd9 100644 --- a/src/musikdroid/gradle/wrapper/gradle-wrapper.properties +++ b/src/musikdroid/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 29 11:27:33 PST 2020 +#Fri Jun 12 11:07:58 PDT 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