Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit a4c122a

Browse files
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 <[email protected]>
1 parent a34dfc9 commit a4c122a

File tree

3 files changed

+63
-3
lines changed

3 files changed

+63
-3
lines changed

build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ class KotlinCommonPlugin : Plugin<Project> {
6262
private val ADDITIONAL_COMPILER_ARGS =
6363
listOf(
6464
"-opt-in=kotlin.RequiresOptIn",
65+
"-P",
66+
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.7.20",
6567
)
6668
}
6769
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ composeUi = "1.3.0-beta03"
77
coroutines = "1.6.4"
88
flowbinding = "1.2.0"
99
hilt = "2.44"
10-
kotlin = "1.7.10"
10+
kotlin = "1.7.20"
1111
leakcanary = "2.9.1"
1212
lifecycle = "2.6.0-alpha02"
1313

@@ -50,7 +50,7 @@ build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
5050
build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.6.1"
5151
build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
5252
compose-animation = "androidx.compose.animation:animation:1.3.0-beta03"
53-
compose-compiler = "androidx.compose.compiler:compiler:1.3.1"
53+
compose-compiler = "androidx.compose.compiler:compiler:1.4.0-dev-k1.7.20-RC-a143c065804"
5454
compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
5555
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
5656
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"

settings.gradle.kts

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,61 @@ dependencyResolutionManagement {
6767
exclusiveContent {
6868
forRepository { google() }
6969
filter {
70+
includeGroup("androidx.activity")
71+
includeGroup("androidx.appcompat")
72+
includeGroup("androidx.annotation")
73+
includeGroup("androidx.arch.core")
74+
includeGroup("androidx.autofill")
75+
includeGroup("androidx.biometric")
76+
includeGroup("androidx.browser")
77+
includeGroup("androidx.cardview")
78+
includeGroup("androidx.collection")
79+
includeGroup("androidx.compose.animation")
80+
includeGroup("androidx.compose.foundation")
81+
includeGroup("androidx.compose.material")
82+
includeGroup("androidx.compose.material3")
83+
includeGroup("androidx.compose.runtime")
84+
includeGroup("androidx.compose.ui")
85+
includeGroup("androidx.concurrent")
86+
includeGroup("androidx.constraintlayout")
87+
includeGroup("androidx.coordinatorlayout")
88+
includeGroup("androidx.core")
89+
includeGroup("androidx.cursoradapter")
90+
includeGroup("androidx.customview")
91+
includeGroup("androidx.databinding")
92+
includeGroup("androidx.documentfile")
93+
includeGroup("androidx.drawerlayout")
94+
includeGroup("androidx.dynamicanimation")
95+
includeGroup("androidx.emoji2")
96+
includeGroup("androidx.exifinterface")
97+
includeGroup("androidx.fragment")
98+
includeGroup("androidx.hilt")
99+
includeGroup("androidx.interpolator")
100+
includeGroup("androidx.legacy")
101+
includeGroup("androidx.lifecycle")
102+
includeGroup("androidx.loader")
103+
includeGroup("androidx.localbroadcastmanager")
104+
includeGroup("androidx.preference")
105+
includeGroup("androidx.print")
106+
includeGroup("androidx.profileinstaller")
107+
includeGroup("androidx.recyclerview")
108+
includeGroup("androidx.resourceinspection")
109+
includeGroup("androidx.room")
110+
includeGroup("androidx.savedstate")
111+
includeGroup("androidx.security")
112+
includeGroup("androidx.slidingpanelayout")
113+
includeGroup("androidx.startup")
114+
includeGroup("androidx.sqlite")
115+
includeGroup("androidx.swiperefreshlayout")
116+
includeGroup("androidx.test")
117+
includeGroup("androidx.test.espresso")
118+
includeGroup("androidx.tracing")
119+
includeGroup("androidx.transition")
120+
includeGroup("androidx.vectordrawable")
121+
includeGroup("androidx.versionedparcelable")
122+
includeGroup("androidx.viewpager")
123+
includeGroup("androidx.viewpager2")
124+
includeGroup("androidx.window")
70125
includeGroup("com.android")
71126
includeGroup("com.android.tools.analytics-library")
72127
includeGroup("com.android.tools.build")
@@ -86,9 +141,12 @@ dependencyResolutionManagement {
86141
includeModule("com.android.tools", "sdklib")
87142
includeModule("com.android.tools", "sdk-common")
88143
includeModule("com.google.android.material", "material")
89-
includeGroupByRegex("androidx.*")
90144
}
91145
}
146+
exclusiveContent {
147+
forRepository { maven(url = "https://androidx.dev/storage/compose-compiler/repository/") }
148+
filter { includeGroup("androidx.compose.compiler") }
149+
}
92150
exclusiveContent {
93151
forRepository { maven("https://jitpack.io") }
94152
filter { includeModule("com.github.haroldadmin", "WhatTheStack") }

0 commit comments

Comments
 (0)