From 0a3a8381a5eda8421152e2b518c147d0e4de3cd1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 17 Jul 2021 16:56:49 -0700 Subject: [PATCH] Add Kotlin support --- app/build.gradle | 19 +++++++++++-------- build.gradle | 12 +++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1602f19..2ae8a45 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' android { compileSdkVersion 30 @@ -46,16 +47,18 @@ android { } dependencies { - implementation 'com.google.android.material:material:1.3.0-alpha03' + implementation 'com.google.android.material:material:1.5.0-alpha01' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.preference:preference:1.1.1' - testImplementation 'junit:junit:4.13' + implementation 'androidx.preference:preference-ktx:1.1.1' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.1' - googleImplementation 'com.google.firebase:firebase-core:17.5.0' - googleImplementation 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' - googleImplementation 'com.google.firebase:firebase-analytics:17.5.0' - googleImplementation 'com.google.android.gms:play-services-location:17.1.0' - googleImplementation 'com.google.android.play:core:1.8.2' + googleImplementation 'com.google.firebase:firebase-core:19.0.0' + googleImplementation 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + googleImplementation 'com.google.firebase:firebase-analytics:19.0.0' + googleImplementation 'com.google.android.gms:play-services-location:18.0.0' + googleImplementation 'com.google.android.play:core:1.10.0' + implementation "androidx.core:core-ktx:1.6.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) { diff --git a/build.gradle b/build.gradle index cea33e3..54dd150 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,20 @@ buildscript { + ext.kotlin_version = '1.5.21' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-beta04' - classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' + classpath 'com.android.tools.build:gradle:7.0.0-beta05' + classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } allprojects { repositories { google() - jcenter() + mavenCentral() } }