From 3731bda761d2e712778807c69919a3100f1e27f7 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 1 Sep 2020 16:53:34 +0200 Subject: [PATCH] Kotlin 1.4.0, fixes #940 --- build.gradle.kts | 6 ++---- cameraview/build.gradle.kts | 14 +++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4e783fc8..5b73b143 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ buildscript { extra["minSdkVersion"] = 15 extra["compileSdkVersion"] = 29 extra["targetSdkVersion"] = 29 - extra["kotlinVersion"] = "1.3.72" repositories { google() @@ -13,10 +12,9 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.0") + classpath("com.android.tools.build:gradle:4.0.1") classpath("com.otaliastudios.tools:publisher:0.3.3") - val kotlinVersion = property("kotlinVersion") as String - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0") } } diff --git a/cameraview/build.gradle.kts b/cameraview/build.gradle.kts index 3b84109b..84bc11ed 100644 --- a/cameraview/build.gradle.kts +++ b/cameraview/build.gradle.kts @@ -25,20 +25,20 @@ android { } dependencies { - testImplementation("junit:junit:4.12") + testImplementation("junit:junit:4.13") testImplementation("org.mockito:mockito-inline:2.28.2") - androidTestImplementation("androidx.test:runner:1.2.0") - androidTestImplementation("androidx.test:rules:1.2.0") + androidTestImplementation("androidx.test:runner:1.3.0") + androidTestImplementation("androidx.test:rules:1.3.0") androidTestImplementation("androidx.test.ext:junit:1.1.1") androidTestImplementation("org.mockito:mockito-android:2.28.2") androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0") - api("androidx.exifinterface:exifinterface:1.1.0") - api("androidx.lifecycle:lifecycle-common:2.1.0") - api("com.google.android.gms:play-services-tasks:17.0.0") + api("androidx.exifinterface:exifinterface:1.2.0") + api("androidx.lifecycle:lifecycle-common:2.2.0") + api("com.google.android.gms:play-services-tasks:17.2.0") implementation("androidx.annotation:annotation:1.1.0") - implementation("com.otaliastudios.opengl:egloo:0.5.2") + implementation("com.otaliastudios.opengl:egloo:0.5.3") } // Publishing