From cf8ec3f658e14f615ed14d8a21f427af31a875a3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 19 Jun 2023 22:18:29 +0530 Subject: fix(autofill-parser): restore older stdlib and language version --- autofill-parser/build.gradle.kts | 10 ++++++++++ gradle/libs.versions.toml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts index 814c3cc0..137aa2a1 100644 --- a/autofill-parser/build.gradle.kts +++ b/autofill-parser/build.gradle.kts @@ -4,6 +4,9 @@ */ @file:Suppress("UnstableApiUsage") +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id("com.github.android-password-store.published-android-library") id("com.github.android-password-store.kotlin-android") @@ -19,7 +22,14 @@ android { namespace = "com.github.androidpasswordstore.autofillparser" } +tasks.withType().configureEach { + compilerOptions { + languageVersion.set(KotlinVersion.KOTLIN_1_7) + } +} + dependencies { + implementation(platform(libs.kotlin1710.bom)) implementation(libs.androidx.annotation) implementation(libs.androidx.autofill) implementation(libs.androidx.core.ktx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c313fb5..de2916fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ coroutines = "1.7.1" flowbinding = "1.2.0" hilt = "2.46.1" kotlin = "1.8.21" +kotlin1710 = { strictly = "[1.7.0,)", prefer = "1.7.10" } leakcanary = "2.11" lifecycle = "2.6.1" @@ -67,6 +68,7 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } +kotlin1710-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin1710" } kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } -- cgit v1.2.3