diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-17 23:41:52 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-17 23:41:52 -0700 |
| commit | becc7a6f6f625e66a3686f6f16d3389bb5da321f (patch) | |
| tree | 3e951205864946aa584c38af9f7d75b1afa4a01a | |
| parent | df669fcd9dbdd16ed2591c7b39b242e9c293fbdd (diff) | |
| download | etbsa-traccar-manager-android-becc7a6f6f625e66a3686f6f16d3389bb5da321f.tar.gz etbsa-traccar-manager-android-becc7a6f6f625e66a3686f6f16d3389bb5da321f.tar.bz2 etbsa-traccar-manager-android-becc7a6f6f625e66a3686f6f16d3389bb5da321f.zip | |
Update project and enable Kotlin
| -rw-r--r-- | app/build.gradle | 7 | ||||
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle index 22545fb..7c131c6 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 @@ -26,12 +27,14 @@ android { } dependencies { - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' googleImplementation 'com.google.firebase:firebase-core:19.0.0' googleImplementation 'com.google.firebase:firebase-analytics:19.0.0' googleImplementation 'com.google.firebase:firebase-messaging:22.0.0' - googleImplementation 'com.google.firebase:firebase-crashlytics:18.0.1' + googleImplementation 'com.google.firebase:firebase-crashlytics:18.1.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 860167a..54dd150 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,14 @@ buildscript { + ext.kotlin_version = '1.5.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + 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.0' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0904b9b..297f2fe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip |