chore: prepare for 2.0.0

wireapp · vitorhugods · Jun 14, 2024 · Jul 17, 2024 · Jul 17, 2024 · Sep 12, 2024
commit 5c4f9e7fefb1809870f9dfce2c37bba28e82df97
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,6 @@ buildscript {
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka.get()}")
         classpath("com.google.protobuf:protobuf-gradle-plugin:${libs.versions.protobufCodegen.get()}")
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${libs.versions.detekt.get()}")
-        classpath("io.gitlab.arturbosch.detekt:detekt-cli:${libs.versions.detekt.get()}")
         classpath("io.github.leandroborgesferreira:dag-command:${libs.versions.dagCommand.get()}")
     }
 }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -27,6 +27,14 @@ repositories {
     maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "org.jetbrains.kotlin") {
+            useVersion(libs.versions.kotlin.get())
+        }
+    }
+}
+
 dependencies {
     implementation(libs.kotlin.plugin)
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka.get()}")

diff --git a/buildSrc/src/main/kotlin/scripts/detekt.gradle.kts b/buildSrc/src/main/kotlin/scripts/detekt.gradle.kts
@@ -31,23 +31,23 @@ dependencies {
     detekt("io.gitlab.arturbosch.detekt:detekt-cli:$detektVersion")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:$detektVersion")
-    detektPlugins("com.wire:detekt-rules:2.0.0-main-SNAPSHOT") {
+    detektPlugins("com.wire:detekt-rules:1.0.0-1.23.6") {
         isChanging = true
     }
 }
 
 detekt {
     buildUponDefaultConfig = true
     // activate all available (even unstable) rules.
-    allRules = false
+    // allRules = false
     config.setFrom(files("$rootDir/detekt/detekt.yml"))
     source.setFrom(files("$rootDir"))
     // a way of suppressing issues before introducing detekt
     baseline = file("$rootDir/detekt/baseline.xml")
 
     // dynamic prop to enable and disable autocorrect, enabled locally via local.properties file
     val autoFixEnabled = getLocalProperty("detektAutofix", "false")
-    autoCorrect.set(autoFixEnabled.toBoolean())
+    autoCorrect = autoFixEnabled.toBoolean()
     println("> Detekt autoCorrect: $autoFixEnabled")
 }
 
@@ -65,3 +65,11 @@ tasks.withType<Detekt> {
         "**/protobuf/**",
     )
 }
+
+configurations.matching { it.name == "detekt" }.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "org.jetbrains.kotlin") {
+            useVersion("1.9.23")
+        }
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"
 completeKotlin = "1.1.0"
 desugar-jdk = "2.0.4"
 kermit = "2.0.3"
-detekt = "main-SNAPSHOT"
+detekt = "1.23.6"
 agp = "8.3.2"
 dokka = "1.8.20"
 carthage = "0.0.1"

diff --git a/logic/src/androidMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt b/logic/src/androidMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt
@@ -53,7 +53,7 @@ internal actual class UserSessionScopeProviderImpl(
     private val networkStateObserver: NetworkStateObserver,
     private val logoutCallback: LogoutCallback,
     userAgent: String
-) : UserSessionScopeProviderCommon(globalCallManager, userStorageProvider, userAgent) {
+) : UserSessionScopeProviderCommon(globalCallManager, userStorageProvider, userAgent), UserSessionScopeProvider {
 
     override fun create(userId: UserId): UserSessionScope {
         val userIdEntity = userId.toDao()

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProvider.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProvider.kt
@@ -58,4 +58,4 @@ abstract class UserSessionScopeProviderCommon(
     abstract fun create(userId: UserId): UserSessionScope
 }
 
-internal expect class UserSessionScopeProviderImpl : UserSessionScopeProviderCommon
+internal expect class UserSessionScopeProviderImpl : UserSessionScopeProvider
diff --git a/util/src/androidMain/kotlin/com.wire.kalium.util/KaliumDispatcherImpl.kt b/util/src/androidMain/kotlin/com.wire.kalium.util/KaliumDispatcherImpl.kt
@@ -20,12 +20,11 @@ package com.wire.kalium.util
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainCoroutineDispatcher
 
 actual object KaliumDispatcherImpl : KaliumDispatcher {
     override val default: CoroutineDispatcher
         get() = Dispatchers.Default
-    override val main: MainCoroutineDispatcher
+    override val main: CoroutineDispatcher
         get() = Dispatchers.Main
     override val unconfined: CoroutineDispatcher
         get() = Dispatchers.Unconfined