chore: update dependencies before code freeze (#2934)

.githooks/pre-commit

@@ -19,10 +19,9 @@
 
 set -e
 ############
-## This Git Hook it's optional and can help you to auto-format your work on commit
-## It will run "spotlessApply" and then add to the prev. staged commit the files modified
+## This Git Hook it's optional and can help you to check code style, before you do your commits.
+## It will run "detektAll"
 ############
-echo "> Running spotless check and apply"
-./gradlew spotlessApply
-git add `git diff --name-only --cached`
+echo "> Running detekt checks"
+./gradlew detektAll
 exit 0

app/build.gradle.kts

@@ -35,7 +35,6 @@ plugins {
  id(ScriptPlugins.quality)
  id(ScriptPlugins.compilation)
  id(ScriptPlugins.testing)
- id(ScriptPlugins.spotless)
  id(libs.plugins.wire.kover.get().pluginId)
 }
 

benchmark/build.gradle.kts

@@ -16,41 +16,19 @@
  * along with this program. If not, see http:https://www.gnu.org/licenses/.
  */
 plugins {
- id("com.android.library")
- id("org.jetbrains.kotlin.android")
+ id(libs.plugins.wire.android.library.get().pluginId)
 }
 
 android {
  namespace = "com.wire.benchmark"
- compileSdk = 34
-
- defaultConfig {
- minSdk = 26
-
- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles("consumer-rules.pro")
- missingDimensionStrategy("contentType", "beta")
- }
-
- buildTypes {
- release {
- isMinifyEnabled = false
- proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
- }
- }
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
- }
- kotlinOptions {
- jvmTarget = JavaVersion.VERSION_17.toString()
- }
+ defaultConfig.missingDimensionStrategy("contentType", "beta")
 }
 
 dependencies {
  implementation(libs.androidx.core)
  implementation(libs.androidx.appcompat)
  implementation(libs.material)
+
  testImplementation(libs.junit4)
  androidTestImplementation(libs.androidx.test.extJunit)
  androidTestImplementation(libs.androidx.espresso.core)

buildSrc/build.gradle.kts

@@ -34,7 +34,6 @@ dependencies {
  implementation(libs.kotlin.gradlePlugin)
  implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${klibs.versions.detekt.get()}")
  implementation("org.jetbrains.kotlinx:kover-gradle-plugin:${libs.versions.kover.get()}")
- implementation(libs.spotless.gradlePlugin)
  implementation(libs.android.junit5)
 
  testImplementation("junit:junit:${libs.versions.junit4.get()}")

buildSrc/src/main/kotlin/Dependencies.kt

@@ -29,5 +29,4 @@ object ScriptPlugins {
  const val quality = "scripts.quality"
  const val compilation = "scripts.compilation"
  const val testing = "scripts.testing"
- const val spotless = "scripts.spotless"
 }

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ androidJunit5 = "1.10.0.0"
 gradle = "8.5"
 
 # Kotlin
-grgitCore = "5.2.0"
+grgitCore = "5.2.2"
 kotlin = "1.9.23"
 
 # KotlinX
@@ -23,7 +23,6 @@ firebaseBOM = "32.8.1"
 fragment = "1.5.6"
 resaca = "2.4.6"
 bundlizer = "0.8.0"
-spotless = "6.1.2"
 squareup-javapoet = "1.13.0"
 visibilityModifiers = "1.1.0"
 kover = "0.7.6"
@@ -74,8 +73,8 @@ openIdAppAuth = "0.11.1"
 
 # Other Tools
 aboutLibraries = "11.1.3"
-leakCanary = "2.7"
-ksp = "1.9.23-1.0.19"
+leakCanary = "2.14"
+ksp = "1.9.23-1.0.20"
 
 # Benchmark
 benchmark-macro-junit4 = "1.2.4"
@@ -94,9 +93,9 @@ junit4 = "4.13.2"
 junit5 = "5.10.2"
 kluent = "1.73"
 mockk = "1.13.10"
-okio = "3.7.0"
-turbine = "1.0.0"
-robolectric = "4.11.1"
+okio = "3.9.0"
+turbine = "1.1.0"
+robolectric = "4.12.1"
 
 [plugins]
 # 3rd Party plugins
@@ -126,7 +125,6 @@ hilt-gradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", v
 googleGms-gradlePlugin = { module = "com.google.gms:google-services", version.ref = "google-gms" }
 googleGms-location = { module = "com.google.android.gms:play-services-location", version.ref = "gms-location" }
 aboutLibraries-gradlePlugin = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutLibraries" }
-spotless-gradlePlugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 kover-gradlePlugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
 
 ktx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "ktx-serialization" }