Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

401 - technical - update dependencies #405

Merged
merged 3 commits into from
Jan 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
26 changes: 13 additions & 13 deletions buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ object Versions {
const val minSdk = 21
const val targetSdk = compileSdk

const val accompanist = "0.23.1"
const val activity = "1.4.0"
const val accompanist = "0.28.0"
const val activity = "1.6.1"
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 browser = "1.4.0"
const val compose = "1.3.1"
const val coil = "2.2.2"
const val core = "1.7.0"
const val core = "1.9.0"
const val customViewPoolingContainer = "1.0.0"
const val dataStorePreferences = "1.0.0"
const val firebaseAppDistributionGradlePlugin = "3.0.1"
const val firebaseBom = "30.0.0"
const val firebaseCrashlyticsGradlePlugin = "2.8.1"
const val firebaseAppDistributionGradlePlugin = "3.1.1"
const val firebaseBom = "31.1.1"
const val firebaseCrashlyticsGradlePlugin = "2.9.2"
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"
const val material = "1.5.0"
const val navigation = "2.4.1"
const val testExtJUnit = "1.1.3"
const val material = "1.7.0"
const val navigation = "2.5.3"
const val testExtJUnit = "1.1.4"
const val timber = "5.0.1"
const val webkit = "1.4.0"
const val webkit = "1.5.0"
}
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- \[All\] Upgrade dependencies ([#401](https://github.com/Orange-OpenSource/ods-android/issues/401))
- \[Demo\] Display food content ([#388](https://github.com/Orange-OpenSource/ods-android/issues/388))

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion component-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -75,7 +75,7 @@ dependencies {

implementation(Dependencies.kotlinStdlibJdk8)
compileOnly(project(":component-processor"))

implementation(Dependencies.accompanistFlowLayout)
implementation(Dependencies.appCompat)
implementation(Dependencies.composeUi)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down