diff --git a/.github/workflows/call-check-changelog.yml b/.github/workflows/call-check-changelog.yml index baf1514a14..ce0d2a85e1 100644 --- a/.github/workflows/call-check-changelog.yml +++ b/.github/workflows/call-check-changelog.yml @@ -12,7 +12,7 @@ jobs: submodules: 'recursive' - name: Get change status for CHANGELOG.md id: changed-changelog - uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # v45.0.0 + uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c # v45.0.2 with: files: CHANGELOG.md - name: Failed if changelog not changed diff --git a/.github/workflows/call-configuration-change.yml b/.github/workflows/call-configuration-change.yml index cbb23e87a3..25c905616d 100644 --- a/.github/workflows/call-configuration-change.yml +++ b/.github/workflows/call-configuration-change.yml @@ -14,7 +14,7 @@ jobs: submodules: 'recursive' - name: Check that gradle files changed id: gradle-related-changed - uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # v45.0.0 + uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c # v45.0.2 with: files: | **.gradle.kts @@ -34,7 +34,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/call-create-baseline.yml b/.github/workflows/call-create-baseline.yml index aaad7ca82e..d75fccbaf6 100644 --- a/.github/workflows/call-create-baseline.yml +++ b/.github/workflows/call-create-baseline.yml @@ -30,7 +30,7 @@ jobs: submodules: 'recursive' - name: Set up JDK 17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'adopt' java-version: 17 @@ -84,7 +84,7 @@ jobs: run: | ./gradlew ${{ steps.create_baseline_task.outputs.BASELINE_TASK }} - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4 name: "Upload baseline file" with: name: ${{ steps.create_baseline_file_id.outputs.BASELINE_FILE_ID }} diff --git a/.github/workflows/internal.yml b/.github/workflows/internal.yml index bcf2c5d2af..6fc45f9430 100644 --- a/.github/workflows/internal.yml +++ b/.github/workflows/internal.yml @@ -21,7 +21,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -79,7 +79,7 @@ jobs: name: ${{ needs.create_internal_baseline.outputs.BASELINE_FILE_ID }} path: ${{ needs.create_internal_baseline.outputs.BASELINE_FILE_PATH }} - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -130,7 +130,7 @@ jobs: cp instances/android/app/build/outputs/mapping/internal/mapping.txt artifacts/mapping-${{ matrix.target }}.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-${{ matrix.target }} path: ${{ steps.artifacts_copy.outputs.path }} @@ -143,7 +143,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -192,7 +192,7 @@ jobs: cp instances/wearable/build/outputs/mapping/internal/mapping.txt artifacts/mapping-wearos.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} diff --git a/.github/workflows/internal_release.yml b/.github/workflows/internal_release.yml index 5f585a363d..352900e1fb 100644 --- a/.github/workflows/internal_release.yml +++ b/.github/workflows/internal_release.yml @@ -58,7 +58,7 @@ jobs: name: ${{ needs.create_internal_baseline.outputs.BASELINE_FILE_ID }} path: ${{ needs.create_internal_baseline.outputs.BASELINE_FILE_PATH }} - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -109,7 +109,7 @@ jobs: cp instances/android/app/build/outputs/mapping/internal/mapping.txt artifacts/mapping-${{ matrix.target }}.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-${{ matrix.target }} path: ${{ steps.artifacts_copy.outputs.path }} @@ -122,7 +122,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -171,7 +171,7 @@ jobs: cp instances/wearable/build/outputs/mapping/internal/mapping.txt artifacts/mapping-wearos.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 857fdfd715..8d89eed1cd 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -53,7 +53,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -73,7 +73,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e51f6d7c6b..6a9d04eca4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -110,7 +110,7 @@ jobs: cp instances/android/app/build/outputs/mapping/release/mapping.txt artifacts/mapping-${{ matrix.target }}.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-${{ matrix.target }} path: ${{ steps.artifacts_copy.outputs.path }} @@ -123,7 +123,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4 with: distribution: 'temurin' java-version: '17' @@ -172,7 +172,7 @@ jobs: cp instances/wearable/build/outputs/mapping/release/mapping.txt artifacts/mapping-wearos.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 06230a9928..5b3fc93062 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] # You also need to bump the version of ksp kotlin-general = "2.0.20" # https://kotlinlang.org/docs/releases.html#release-details -kotlin-immutable-collections = "0.3.7" # https://github.com/Kotlin/kotlinx.collections.immutable/releases +kotlin-immutable-collections = "0.3.8" # https://github.com/Kotlin/kotlinx.collections.immutable/releases kotlin-datetime = "0.6.1" # https://github.com/Kotlin/kotlinx-datetime/releases -kotlinx = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines/releases -ksp = "2.0.20-1.0.24" # https://github.com/google/ksp/releases +kotlinx = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines/releases +ksp = "2.0.20-1.0.25" # https://github.com/google/ksp/releases anvil = "2.5.0-beta11" # https://github.com/square/anvil/releases anvil-utils = "0.2.1-beta01" # https://github.com/IlyaGulya/anvil-utils/releases -android-gradle = "8.6.0" # https://developer.android.com/studio/releases/gradle-plugin -protobuf = "4.28.0" # https://github.com/protocolbuffers/protobuf/releases +android-gradle = "8.6.1" # https://developer.android.com/studio/releases/gradle-plugin +protobuf = "4.28.2" # https://github.com/protocolbuffers/protobuf/releases protobuf-gradle = "0.9.4" # https://github.com/google/protobuf-gradle-plugin/releases -compose-material = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose#versions -compose-foundation = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose#versions -compose-ui = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose#versions -compose-wear = "1.3.1" # https://developer.android.com/jetpack/androidx/releases/wear-compose +compose-material = "1.7.2" # https://developer.android.com/jetpack/androidx/releases/compose#versions +compose-foundation = "1.7.2" # https://developer.android.com/jetpack/androidx/releases/compose#versions +compose-ui = "1.7.2" # https://developer.android.com/jetpack/androidx/releases/compose#versions +compose-wear = "1.4.0" # https://developer.android.com/jetpack/androidx/releases/wear-compose compose-wear-preview = "1.0.0" # https://mvnrepository.com/artifact/androidx.wear/wear-tooling-preview -compose-accompanist = "0.34.0" # https://github.com/google/accompanist/releases +compose-accompanist = "0.36.0" # https://github.com/google/accompanist/releases compose-placeholder = "2.0.0" # https://github.com/fornewid/placeholder/releases compose-constraint = "1.0.1" # https://developer.android.com/jetpack/compose/layouts/constraintlayout compose-paging = "3.3.2" # https://developer.android.com/jetpack/androidx/releases/paging @@ -26,7 +26,7 @@ compose-multiplatform = "1.6.11" # https://github.com/JetBrains/compose-multipla # Android API 35 not supported by roboelectric horologist = "0.6.17" # https://github.com/google/horologist/releases # Until fix https://github.com/Kotlin/kotlinx.serialization/issues/2803 -serialization-json = "1.7.1" # https://github.com/Kotlin/kotlinx.serialization/releases +serialization-json = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization/releases wear = "1.3.0" # https://developer.android.com/jetpack/androidx/releases/wear wear-gms = "18.2.0" # https://mvnrepository.com/artifact/com.google.android.gms/play-services-wearable?repo=google wear-interaction-phone = "1.1.0-alpha04" # https://developer.android.com/jetpack/androidx/releases/wear @@ -39,9 +39,9 @@ sentry-runtime = "7.14.0" # https://github.com/getsentry/sentry-java/releases sentry-gradle = "4.11.0" # https://github.com/getsentry/sentry-android-gradle-plugin/releases zip4j = "2.11.5" # https://github.com/srikanth-lingala/zip4j/releases ktx = "1.13.1" # https://developer.android.com/jetpack/androidx/releases/core -ktx-activity = "1.9.1" # https://developer.android.com/jetpack/androidx/releases/activity +ktx-activity = "1.9.2" # https://developer.android.com/jetpack/androidx/releases/activity ktx-testing = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/test -lifecycle = "2.8.4" # https://developer.android.com/jetpack/androidx/releases/lifecycle +lifecycle = "2.8.6" # https://developer.android.com/jetpack/androidx/releases/lifecycle fastutil = "8.5.14" # https://github.com/vigna/fastutil/tags ble = "2.8.0" # https://github.com/NordicSemiconductor/Android-BLE-Library/releases ble-scan = "1.6.0" # https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/releases @@ -49,7 +49,7 @@ ble-kotlin = "1.1.0" # https://github.com/NordicSemiconductor/Kotlin-BLE-Library # don't update to 2.x, unless the ble-kotlin is also updated. PR: https://github.com/arcao/slf4j-timber/pull/12 slf4j = "1.7.36" # https://github.com/qos-ch/slf4j/tags slf4j-timber = "3.1" # https://github.com/arcao/slf4j-timber -lottie = "6.5.1" # https://github.com/airbnb/lottie/blob/master/android-compose.md +lottie = "6.5.2" # https://github.com/airbnb/lottie/blob/master/android-compose.md material = "1.12.0" # https://github.com/material-components/material-components-android/releases splashscreen = "1.1.0-rc01" # https://developer.android.com/jetpack/androidx/releases/core annotations = "1.8.2" # https://developer.android.com/jetpack/androidx/releases/annotation @@ -58,18 +58,18 @@ androidx-core = "1.13.1" # https://developer.android.com/jetpack/androidx/releas datastore = "1.1.1" # https://developer.android.com/topic/libraries/architecture/datastore # https://github.com/vsch/flexmark-java/issues/442 flexmark = "0.42.14" # https://github.com/vsch/flexmark-java/tags -markdown = "0.25.0" # https://github.com/mikepenz/multiplatform-markdown-renderer/releases +markdown = "0.26.0" # https://github.com/mikepenz/multiplatform-markdown-renderer/releases ktor = "2.3.12" # https://ktor.io/ apache-compress = "1.27.1" # https://commons.apache.org/proper/commons-compress/ apache-codec = "1.17.1" # https://mvnrepository.com/artifact/commons-codec/commons-codec -countly = "24.7.2" # https://github.com/Countly/countly-sdk-android/releases +countly = "24.7.3" # https://github.com/Countly/countly-sdk-android/releases grgit-gradle = "8d818b74b9" work = "2.9.1" # https://developer.android.com/jetpack/androidx/releases/work coil = "2.7.0" # https://github.com/coil-kt/coil/releases play-core = "2.1.0" # https://developer.android.com/guide/playcore#java-kotlin-in-app-update decompose = "3.1.0" # https://github.com/arkivanov/Decompose/releases essenty = "2.1.0" # https://github.com/arkivanov/Essenty/releases -zoomable = "1.6.1" #https://github.com/usuiat/Zoomable +zoomable = "1.6.2" #https://github.com/usuiat/Zoomable # Testing junit = "4.13.2" # https://github.com/junit-team/junit4/releases mockito = "5.4.0" # https://github.com/mockito/mockito/releases @@ -79,15 +79,15 @@ mockk = "1.13.12" # https://mockk.io/ # Testing UI espresso-core = "3.6.1" # https://github.com/android/android-test uiautomator = "2.3.0" # https://developer.android.com/training/testing/other-components/ui-automator#set-ui -benchmark-macro-junit4 = "1.3.0" # https://developer.android.com/jetpack/androidx/releases/benchmark -baselineprofile = "1.3.0" # https://developer.android.com/topic/performance/baselineprofiles/overview#recommended-versions -profileinstaller = "1.3.1" # https://developer.android.com/topic/performance/baselineprofiles/overview#recommended-versions +benchmark-macro-junit4 = "1.3.1" # https://developer.android.com/jetpack/androidx/releases/benchmark +baselineprofile = "1.3.1" # https://developer.android.com/topic/performance/baselineprofiles/overview#recommended-versions +profileinstaller = "1.4.0" # https://developer.android.com/topic/performance/baselineprofiles/overview#recommended-versions # Linters -detekt = "1.23.6" # https://detekt.dev/docs/gettingstarted/gradle/ +detekt = "1.23.7" # https://detekt.dev/docs/gettingstarted/gradle/ detekt-ruleset-compiler = "0.0.4" # https://github.com/BraisGabin/detekt-compiler-rules/releases detekt-ruleset-ktlint = "0.50.0" # https://github.com/pinterest/ktlint/releases -detekt-ruleset-compose = "0.4.11" # https://github.com/mrmans0n/compose-rules/releases +detekt-ruleset-compose = "0.4.12" # https://github.com/mrmans0n/compose-rules/releases detekt-ruleset-decompose = "1.0.1" # https://github.com/LionZXY/detekt-decompose-rule/releases # Firebase @@ -95,10 +95,10 @@ google-gms-gradle = "4.4.2" # https://developers.google.com/android/guides/googl google-gms-firebase = "24.0.1" # https://firebase.google.com/docs/android/setup#kotlin:~:text=com.google.firebase%3Afirebase%2Dmessaging # Build Config -buildkonfig = "5.4.0" +buildkonfig = "5.5.0" -wire = "5.0.0" -okio = "3.9.0" +wire = "5.1.0" +okio = "3.9.1" [libraries] # Gradle - Core diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 66cd5a0e49..1ed247ec13 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME