Skip to content

Commit

Permalink
Merge branch 'master' into renovate/compose
Browse files Browse the repository at this point in the history
  • Loading branch information
hoc081098 authored Jan 14, 2025
2 parents 73e242a + 82f68c1 commit b901332
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: ./gradlew :koverXmlReport

- name: Upload Test Report
uses: codecov/codecov-action@v4.6.0
uses: codecov/codecov-action@v5.1.2
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:

- name: Deploy docs 🚀 to website
if: ${{ contains(matrix.os, 'macos') }}
uses: JamesIves/github-pages-deploy-action@v4.6.9
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: site # The folder the action should deploy.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:

- name: Deploy docs 🚀 to website
if: ${{ contains(matrix.os, 'macos') }}
uses: JamesIves/github-pages-deploy-action@v4.6.9
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: site # The folder the action should deploy.
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs==1.6.1
mkdocs-material==9.5.44
pymdown-extensions==10.12
mkdocs-material==9.5.49
pymdown-extensions==10.14
mdx_truly_sane_lists==1.3 # https://github.com/radude/mdx_truly_sane_lists
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ jetbrains-compose = "1.7.3"

napier = "2.7.1"
flowExt = "1.0.0"
koin = "4.0.0"
koin-compose = "4.0.0"
koin = "4.0.1"
koin-compose = "4.0.1"
koin-androidx-compose = "4.0.0"
compose-rules-detekt = "0.4.18"
compose-rules-detekt = "0.4.22"

androidx-lifecycle = "2.8.7"
androidx-annotation = "1.9.1"
androidx-activity = "1.9.3"
android-gradle = "8.7.2"
android-gradle = "8.8.0"

coil = "3.0.2"
ktor = "3.0.1"
coil = "3.0.4"
ktor = "3.0.3"

kmp-viewmodel = "0.8.0"
uuid = "0.8.4"

spotless = "6.25.0"
spotless = "7.0.1"
detekt = "1.23.7"
kotlinx-kover = "0.8.3"
dokka = "1.9.20"
kotlinx-binary-compatibility-validator = "0.16.3"
kotlinx-kover = "0.9.1"
dokka = "2.0.0"
kotlinx-binary-compatibility-validator = "0.17.0"
poko = "0.17.2"
vanniktech-maven-publish = "0.30.0"
ktlint = "1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ include(
)

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
}

0 comments on commit b901332

Please sign in to comment.