[#401] Upgrade Kotlin to 1.7.10 and Compose to 1.3.1

Orange-OpenSource · Jan 16, 2023 · 64aa0b2 · 64aa0b2
1 parent 6b98395
commit 64aa0b2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -27,6 +27,6 @@ java {
 
 dependencies {
     implementation("com.android.tools.build:gradle:7.3.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") // https://issuetracker.google.com/issues/176079157#comment14
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") // https://issuetracker.google.com/issues/176079157#comment14
     implementation("com.squareup:javapoet:1.13.0") // https://github.com/google/dagger/issues/3282
 }
diff --git a/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt b/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt
@@ -21,7 +21,7 @@ object Versions {
     const val androidGradlePlugin = "7.3.1"
     const val appCompat = "1.5.1"
     const val browser = "1.3.0"
-    const val compose = "1.2.0-rc02"
+    const val compose = "1.3.1"
     const val coil = "2.2.2"
     const val core = "1.7.0"
     const val customViewPoolingContainer = "1.0.0"
@@ -32,7 +32,7 @@ object Versions {
     const val googleServicesGradlePlugin = "4.3.14"
     const val hilt = "2.44"
     const val jUnit = "4.13.2"
-    const val kotlin = "1.6.21"
+    const val kotlin = "1.7.10"
     const val kotlinPoet = "1.12.0"
     const val ksp = "$kotlin-1.0.6"
     const val lifecycle = "2.5.1"

diff --git a/component-processor/build.gradle.kts b/component-processor/build.gradle.kts
@@ -12,7 +12,7 @@ import com.orange.ods.gradle.Dependencies
 
 plugins {
     kotlin("jvm")
-    id("com.google.devtools.ksp") version "1.6.21-1.0.6"
+    id("com.google.devtools.ksp") version "1.7.10-1.0.6"
 }
 
 sourceSets.main {

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -12,7 +12,7 @@ import com.orange.ods.gradle.Dependencies
 import com.orange.ods.gradle.Versions
 
 plugins {
-    id("com.google.devtools.ksp") version "1.6.21-1.0.6"
+    id("com.google.devtools.ksp") version "1.7.10-1.0.6"
     id("com.android.library")
     id("kotlin-android")
     id("github")
@@ -75,7 +75,7 @@ dependencies {
 
     implementation(Dependencies.kotlinStdlibJdk8)
     compileOnly(project(":component-processor"))
-   
+
     implementation(Dependencies.accompanistFlowLayout)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.composeUi)

diff --git a/lib/src/main/java/com/orange/ods/utilities/extension/ModifierExt.kt b/lib/src/main/java/com/orange/ods/utilities/extension/ModifierExt.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.composed
 /**
  * Allow to activate click on an element without any ripple effect
  */
-inline fun Modifier.noRippleClickable(crossinline onClick: () -> Unit): Modifier = composed {
+fun Modifier.noRippleClickable(onClick: () -> Unit): Modifier = composed {
     clickable(indication = null,
         interactionSource = remember { MutableInteractionSource() }) {
         onClick()