diff --git a/.github/workflows/call-create-baseline.yml b/.github/workflows/call-create-baseline.yml index af70f3227c..5e7dce27ad 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 with: distribution: 'adopt' java-version: 17 diff --git a/.github/workflows/call-gradle-cache.yml b/.github/workflows/call-gradle-cache.yml index a94246fbab..fd5f332cbf 100644 --- a/.github/workflows/call-gradle-cache.yml +++ b/.github/workflows/call-gradle-cache.yml @@ -34,7 +34,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/internal.yml b/.github/workflows/internal.yml index 0cdcb8ee2d..649f7dfb39 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 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 b67471f01d..7ca5e4744e 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bb227e6e18..3934609ea8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -50,7 +50,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 with: distribution: 'temurin' java-version: '17' @@ -67,7 +67,7 @@ jobs: with: submodules: 'recursive' - name: Set up JDK 1.17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2667bf14fc..18b7826ad0 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml index 478f9f64e4..3569737889 100755 --- a/config/detekt/detekt.yml +++ b/config/detekt/detekt.yml @@ -753,7 +753,7 @@ Compose: ModifierWithoutDefault: active: true MultipleEmitters: - active: true + active: false # You can optionally add your own composables here # contentEmitters: MyComposable,MyOtherComposable MutableParams: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33013bc663..158c42b24a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,10 +6,10 @@ kotlin-immutable-collections = "0.3.7" # https://github.com/Kotlin/kotlinx.colle kotlin-datetime = "0.6.0" # https://github.com/Kotlin/kotlinx-datetime/releases kotlinx = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines/releases ksp = "2.0.10-RC2-1.0.24" # https://github.com/google/ksp/releases -anvil = "2.5.0-beta09" # https://github.com/square/anvil/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.5.1" # https://developer.android.com/studio/releases/gradle-plugin -protobuf = "4.27.2" # https://github.com/protocolbuffers/protobuf/releases +protobuf = "4.27.3" # 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 @@ -19,37 +19,37 @@ compose-wear-preview = "1.0.0" # https://mvnrepository.com/artifact/androidx.wea compose-accompanist = "0.34.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.0" # https://developer.android.com/jetpack/androidx/releases/paging +compose-paging = "3.3.1" # https://developer.android.com/jetpack/androidx/releases/paging compose-drag-drop = "0.9.6" # https://github.com/aclassen/ComposeReorderable/releases compose-multiplatform = "1.6.11" # https://github.com/JetBrains/compose-multiplatform/releases -horologist = "0.6.16" # https://github.com/google/horologist/releases +horologist = "0.6.17" # https://github.com/google/horologist/releases serialization-json = "1.7.1" # 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 wear-interaction-remote = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/wear room = "2.6.1" # https://developer.android.com/jetpack/androidx/releases/room -dagger = "2.51.1" # https://github.com/google/dagger/releases +dagger = "2.52" # https://github.com/google/dagger/releases timber = "5.0.1" # https://github.com/JakeWharton/timber/releases timber-treessence = "1.1.2" # https://github.com/bastienpaulfr/Treessence/tags -sentry-runtime = "7.12.0" # https://github.com/getsentry/sentry-java/releases +sentry-runtime = "7.13.0" # https://github.com/getsentry/sentry-java/releases sentry-gradle = "4.10.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.0" # https://developer.android.com/jetpack/androidx/releases/activity +ktx-activity = "1.9.1" # https://developer.android.com/jetpack/androidx/releases/activity ktx-testing = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/test -lifecycle = "2.8.3" # https://developer.android.com/jetpack/androidx/releases/lifecycle -fastutil = "8.5.13" # https://github.com/vigna/fastutil/tags +lifecycle = "2.8.4" # https://developer.android.com/jetpack/androidx/releases/lifecycle +fastutil = "8.5.14" # https://github.com/vigna/fastutil/tags ble = "2.7.5" # https://github.com/NordicSemiconductor/Android-BLE-Library/releases ble-scan = "1.6.0" # https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/releases ble-kotlin = "1.1.0" # https://github.com/NordicSemiconductor/Kotlin-BLE-Library/releases # 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.4.1" # https://github.com/airbnb/lottie/blob/master/android-compose.md +lottie = "6.5.0" # 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.0" # https://developer.android.com/jetpack/androidx/releases/annotation +annotations = "1.8.1" # https://developer.android.com/jetpack/androidx/releases/annotation appcompat = "1.7.0" # https://developer.android.com/jetpack/androidx/releases/appcompat datastore = "1.1.1" # https://developer.android.com/topic/libraries/architecture/datastore # https://github.com/vsch/flexmark-java/issues/442 @@ -58,7 +58,7 @@ markdown = "0.25.0" # https://github.com/mikepenz/multiplatform-markdown-rendere ktor = "2.3.12" # https://ktor.io/ apache-compress = "1.26.2" # https://commons.apache.org/proper/commons-compress/ apache-codec = "1.17.1" # https://mvnrepository.com/artifact/commons-codec/commons-codec -countly = "24.7.0" # https://github.com/Countly/countly-sdk-android/releases +countly = "24.7.1" # https://github.com/Countly/countly-sdk-android/releases grgit-gradle = "8d818b74b9" work = "2.9.0" # https://developer.android.com/jetpack/androidx/releases/work coil = "2.7.0" # https://github.com/coil-kt/coil/releases @@ -83,7 +83,7 @@ profileinstaller = "1.3.1" # https://developer.android.com/topic/performance/bas detekt = "1.23.6" # 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.5" # https://github.com/mrmans0n/compose-rules/releases +detekt-ruleset-compose = "0.4.9" # https://github.com/mrmans0n/compose-rules/releases detekt-ruleset-decompose = "1.0.1" # https://github.com/LionZXY/detekt-decompose-rule/releases # Firebase