From 7b13d4079708e675a038a3b774ea494be9d7892e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 11 Jan 2023 17:41:04 +0530 Subject: [PATCH] chore(deps): upgrade to Kotlin 1.8.0 --- .github/renovate.json | 2 +- gradle/libs.versions.toml | 8 ++++---- settings.gradle.kts | 13 ++++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index a6eb316e..bddb1bf1 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -35,7 +35,7 @@ "androidx.compose.compiler:compiler" ], "registryUrls": [ - "https://maven.google.com/" + "https://androidx.dev/storage/compose-compiler/repository/" ] } ], diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7542dc98..2962e99b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,18 +4,18 @@ agp = "7.4.0-rc03" androidx-test = "1.5.0" coil = "2.2.2" # @keep used for kotlinCompilerExtensionVersion -composeCompiler = "1.4.0-alpha02" +composeCompiler = "1.4.0-dev-k1.8.0-33c0ad36f83" coroutines = "1.6.4" dagger = "2.44.2" kotest = "5.5.4" -kotlin = "1.7.21" +kotlin = "1.8.0" # @pin Needs to be aligned with Retrofit okhttp = "3.14.9" retrofit = "2.9.0" richtext = "0.16.0" serialization = "1.4.1" sqldelight = "2.0.0-alpha04" -whetstone = "0.5.0-SNAPSHOT" +whetstone = "0.6.0-SNAPSHOT" workmanager = "2.8.0-rc01" [libraries] @@ -86,7 +86,7 @@ whetstone = { module = "com.deliveryhero.whetstone:whetstone", version.ref = "wh [plugins] android-test = { id = "com.android.test", version.ref = "agp" } -anvil = "com.squareup.anvil:2.4.3" +anvil = "com.squareup.anvil:2.4.4-SNAPSHOT" kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } whetstone = { id = "dev.msfjarvis.whetstone", version.ref = "whetstone" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 01876a9c..895b3f1f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,6 +38,10 @@ pluginManagement { forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } filter { includeGroup("dev.msfjarvis.whetstone") } } + exclusiveContent { + forRepository { maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("com.squareup.anvil") } + } includeBuild("build-logic") mavenCentral() } @@ -59,7 +63,6 @@ dependencyResolutionManagement { includeGroup("androidx.collection") includeGroup("androidx.compose") includeGroup("androidx.compose.animation") - includeGroup("androidx.compose.compiler") includeGroup("androidx.compose.foundation") includeGroup("androidx.compose.material") includeGroup("androidx.compose.material3") @@ -113,6 +116,14 @@ dependencyResolutionManagement { forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } filter { includeGroup("dev.msfjarvis.whetstone") } } + exclusiveContent { + forRepository { maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("com.squareup.anvil") } + } + exclusiveContent { + forRepository { maven("https://androidx.dev/storage/compose-compiler/repository/") } + filter { includeGroup("androidx.compose.compiler") } + } mavenCentral() } }