From a4c122a4b1c237782e66bcfc4433df575315286a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:13:16 +0530
Subject: [PATCH] fix(deps): update kotlin to v1.7.20 (#2154)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../gradle/KotlinCommonPlugin.kt              |  2 +
 gradle/libs.versions.toml                     |  4 +-
 settings.gradle.kts                           | 60 ++++++++++++++++++-
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
index f37e427d..24bd95de 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
@@ -62,6 +62,8 @@ class KotlinCommonPlugin : Plugin<Project> {
     private val ADDITIONAL_COMPILER_ARGS =
       listOf(
         "-opt-in=kotlin.RequiresOptIn",
+        "-P",
+        "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.7.20",
       )
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e500243a..f64def88 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ composeUi = "1.3.0-beta03"
 coroutines = "1.6.4"
 flowbinding = "1.2.0"
 hilt = "2.44"
-kotlin = "1.7.10"
+kotlin = "1.7.20"
 leakcanary = "2.9.1"
 lifecycle = "2.6.0-alpha02"
 
@@ -50,7 +50,7 @@ build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
 build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.6.1"
 build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
 compose-animation = "androidx.compose.animation:animation:1.3.0-beta03"
-compose-compiler = "androidx.compose.compiler:compiler:1.3.1"
+compose-compiler = "androidx.compose.compiler:compiler:1.4.0-dev-k1.7.20-RC-a143c065804"
 compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
 compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
 compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2c2ad35e..8727067c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -67,6 +67,61 @@ dependencyResolutionManagement {
     exclusiveContent {
       forRepository { google() }
       filter {
+        includeGroup("androidx.activity")
+        includeGroup("androidx.appcompat")
+        includeGroup("androidx.annotation")
+        includeGroup("androidx.arch.core")
+        includeGroup("androidx.autofill")
+        includeGroup("androidx.biometric")
+        includeGroup("androidx.browser")
+        includeGroup("androidx.cardview")
+        includeGroup("androidx.collection")
+        includeGroup("androidx.compose.animation")
+        includeGroup("androidx.compose.foundation")
+        includeGroup("androidx.compose.material")
+        includeGroup("androidx.compose.material3")
+        includeGroup("androidx.compose.runtime")
+        includeGroup("androidx.compose.ui")
+        includeGroup("androidx.concurrent")
+        includeGroup("androidx.constraintlayout")
+        includeGroup("androidx.coordinatorlayout")
+        includeGroup("androidx.core")
+        includeGroup("androidx.cursoradapter")
+        includeGroup("androidx.customview")
+        includeGroup("androidx.databinding")
+        includeGroup("androidx.documentfile")
+        includeGroup("androidx.drawerlayout")
+        includeGroup("androidx.dynamicanimation")
+        includeGroup("androidx.emoji2")
+        includeGroup("androidx.exifinterface")
+        includeGroup("androidx.fragment")
+        includeGroup("androidx.hilt")
+        includeGroup("androidx.interpolator")
+        includeGroup("androidx.legacy")
+        includeGroup("androidx.lifecycle")
+        includeGroup("androidx.loader")
+        includeGroup("androidx.localbroadcastmanager")
+        includeGroup("androidx.preference")
+        includeGroup("androidx.print")
+        includeGroup("androidx.profileinstaller")
+        includeGroup("androidx.recyclerview")
+        includeGroup("androidx.resourceinspection")
+        includeGroup("androidx.room")
+        includeGroup("androidx.savedstate")
+        includeGroup("androidx.security")
+        includeGroup("androidx.slidingpanelayout")
+        includeGroup("androidx.startup")
+        includeGroup("androidx.sqlite")
+        includeGroup("androidx.swiperefreshlayout")
+        includeGroup("androidx.test")
+        includeGroup("androidx.test.espresso")
+        includeGroup("androidx.tracing")
+        includeGroup("androidx.transition")
+        includeGroup("androidx.vectordrawable")
+        includeGroup("androidx.versionedparcelable")
+        includeGroup("androidx.viewpager")
+        includeGroup("androidx.viewpager2")
+        includeGroup("androidx.window")
         includeGroup("com.android")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
@@ -86,9 +141,12 @@ dependencyResolutionManagement {
         includeModule("com.android.tools", "sdklib")
         includeModule("com.android.tools", "sdk-common")
         includeModule("com.google.android.material", "material")
-        includeGroupByRegex("androidx.*")
       }
     }
+    exclusiveContent {
+      forRepository { maven(url = "https://androidx.dev/storage/compose-compiler/repository/") }
+      filter { includeGroup("androidx.compose.compiler") }
+    }
     exclusiveContent {
       forRepository { maven("https://jitpack.io") }
       filter { includeModule("com.github.haroldadmin", "WhatTheStack") }