Skip to content

Commit

Permalink
chore(deps): update minor
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Nov 13, 2024
1 parent 8965ced commit 4544448
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.13.0
with:
distribution: 'zulu'
java-version: 11
- name: run lint and unitTest
run: ./gradlew lintDebug testDebugUnitTest
- name: run instrumented tests
uses: reactivecircus/android-emulator-runner@v2.25.0
uses: reactivecircus/android-emulator-runner@v2.33.0
with:
api-level: 31
arch: x86_64
Expand Down
2 changes: 1 addition & 1 deletion base-module.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
}

dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.3'

implementation Compose.compiler
implementation Compose.ui
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ buildscript {

plugins {
id(Linter.ktlint) version Linter.ktlintVersion
id("com.android.library") version "7.2.2" apply false
id("org.jetbrains.kotlin.android") version "1.7.10" apply false
id("org.jetbrains.kotlin.jvm") version "1.7.10" apply false
id("com.android.library") version "7.4.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.25" apply false
id("org.jetbrains.kotlin.jvm") version "1.9.25" apply false
}

tasks.register("clean", Delete::class) {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/java/Build.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
object Build {
private const val androidBuildToolsVersion = "7.2.2"
private const val androidBuildToolsVersion = "7.4.2"
const val androidBuildTools = "com.android.tools.build:gradle:$androidBuildToolsVersion"

const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${KotlinObject.version}"

private const val hiltAndroidGradlePluginVersion = "2.38.1"
private const val hiltAndroidGradlePluginVersion = "2.52"
const val hiltAndroidGradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:$hiltAndroidGradlePluginVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Coil.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object Coil {
private const val version = "2.2.0"
private const val version = "2.7.0"
const val coilCompose = "io.coil-kt:coil-compose:$version"
}
12 changes: 6 additions & 6 deletions buildSrc/src/main/java/Compose.kt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
object Compose {
const val composeVersion = "1.2.1"
const val composeCompilerVersion = "1.3.0"
const val composeVersion = "1.7.5"
const val composeCompilerVersion = "1.5.15"
const val material = "androidx.compose.material:material:$composeVersion"
const val ui = "androidx.compose.ui:ui:$composeVersion"
const val uiToolingPreview = "androidx.compose.ui:ui-tooling-preview:$composeVersion"
const val runtime = "androidx.compose.runtime:runtime:$composeVersion"
const val compiler = "androidx.compose.compiler:compiler:$composeCompilerVersion"


private const val navigationVersion = "2.5.1"
private const val navigationVersion = "2.8.4"
const val navigation = "androidx.navigation:navigation-compose:$navigationVersion"

private const val hiltNavigationComposeVersion = "1.0.0"
private const val hiltNavigationComposeVersion = "1.2.0"
const val hiltNavigationCompose = "androidx.hilt:hilt-navigation-compose:$hiltNavigationComposeVersion"

private const val activityComposeVersion = "1.4.0"
private const val activityComposeVersion = "1.9.3"
const val activityCompose = "androidx.activity:activity-compose:$activityComposeVersion"

private const val lifecycleVersion = "2.5.1"
private const val lifecycleVersion = "2.8.7"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"

const val composeTooling = "androidx.compose.ui:ui-tooling:$composeVersion"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Coroutines.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object Coroutines {
const val version = "1.6.4"
const val version = "1.9.0"
const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/DaggerHilt.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object DaggerHilt {
const val version = "2.43.2"
const val version = "2.52"
const val hiltAndroid = "com.google.dagger:hilt-android:$version"
const val hiltCompiler = "com.google.dagger:hilt-android-compiler:$version"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/KotlinObject.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object KotlinObject {
const val version = "1.7.10"
const val version = "1.9.25"
}

4 changes: 2 additions & 2 deletions buildSrc/src/main/java/Retrofit.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
object Retrofit {
private const val version = "2.9.0"
private const val version = "2.11.0"
const val retrofit = "com.squareup.retrofit2:retrofit:$version"
const val moshiConverter = "com.squareup.retrofit2:converter-moshi:$version"

private const val okHttpVersion = "4.9.3"
private const val okHttpVersion = "4.12.0"
const val okHttp = "com.squareup.okhttp3:okhttp:$okHttpVersion"
const val okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Room.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Room {
private const val version = "2.4.3"
private const val version = "2.6.1"
const val roomRuntime = "androidx.room:room-runtime:$version"
const val roomCompiler = "androidx.room:room-compiler:$version"
const val roomKtx = "androidx.room:room-ktx:$version"
Expand Down
16 changes: 8 additions & 8 deletions buildSrc/src/main/java/Testing.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@ object Testing {
private const val junitVersion = "4.13.2"
const val junit4 = "junit:junit:$junitVersion"

private const val junitAndroidExtVersion = "1.1.3"
private const val junitAndroidExtVersion = "1.2.1"
const val junitAndroidExt = "androidx.test.ext:junit:$junitAndroidExtVersion"

private const val coroutinesTestVersion = "1.5.1"
private const val coroutinesTestVersion = "1.9.0"
const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTestVersion"

private const val truthVersion = "1.1.3"
private const val truthVersion = "1.4.4"
const val truth = "com.google.truth:truth:$truthVersion"

private const val mockkVersion = "1.10.0"
private const val mockkVersion = "1.13.13"
const val mockk = "io.mockk:mockk:$mockkVersion"
const val mockkAndroid = "io.mockk:mockk-android:$mockkVersion"

private const val mockWebServerVersion = "4.9.3"
private const val mockWebServerVersion = "4.12.0"
const val mockWebServer = "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion"

const val composeUiTest = "androidx.compose.ui:ui-test-junit4:${Compose.composeVersion}"

private const val testRunnerVersion = "1.4.0"
private const val testRunnerVersion = "1.6.2"
const val testRunner = "androidx.test:runner:$testRunnerVersion"

private const val robolectricVersion = "4.8.2"
private const val robolectricVersion = "4.13"
const val robolectric = "org.robolectric:robolectric:$robolectricVersion"

const val espressoCore = "androidx.test.espresso:espresso-core:3.4.0"
const val espressoCore = "androidx.test.espresso:espresso-core:3.6.1"
}
2 changes: 1 addition & 1 deletion compose-module.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
}

dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.3'

implementation Compose.compiler
implementation Compose.ui
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down

0 comments on commit 4544448

Please sign in to comment.