diff --git a/.github/workflows/develop_ci.yml b/.github/workflows/develop_ci.yml index b0cc609d..ec6f6358 100644 --- a/.github/workflows/develop_ci.yml +++ b/.github/workflows/develop_ci.yml @@ -21,13 +21,13 @@ jobs: outputs: any: ${{ steps.changed-files.outputs.any_changed }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.5.2 with: - submodules: 'recursive' + submodules: "recursive" fetch-depth: 0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v35.7.8 + uses: tj-actions/changed-files@v35.9.2 with: files: | .github/workflows/develop_ci.yml @@ -37,12 +37,12 @@ jobs: **/*.xml check-codestyle: - needs: [ file-changes ] + needs: [file-changes] runs-on: ubuntu-latest if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 @@ -60,15 +60,15 @@ jobs: gradle-home-cache-cleanup: true unit-tests: - needs: [ check-codestyle ] + needs: [check-codestyle] strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 @@ -93,15 +93,15 @@ jobs: path: app/build/reports/tests/ build-apks: - needs: [ check-codestyle ] + needs: [check-codestyle] strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index ada66812..f89e6630 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -13,14 +13,14 @@ jobs: outputs: any: ${{ steps.changed-files.outputs.any_changed }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.5.2 with: submodules: 'recursive' fetch-depth: 0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v35.7.8 + uses: tj-actions/changed-files@v35.9.2 with: files: | .github/workflows/pr_ci.yml @@ -41,7 +41,7 @@ jobs: if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 - name: Set up JDK @@ -63,7 +63,7 @@ jobs: if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 - name: Set up JDK @@ -88,7 +88,7 @@ jobs: if: needs.file-changes.outputs.any == 'true' steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 - name: Set up JDK diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cf3eff99..e402eaf9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] axCore = "1.10.0" axAppcompat = "1.6.1" -axActivity = "1.7.0" +axActivity = "1.7.1" axConstraintlayout = "2.1.4" axDatastore = "1.0.0" axNavigation = "2.5.3" axTest = "1.4.0" axWork = "2.8.1" coroutines = "1.6.4" -googleMaterial = "1.8.0" -agp = "8.1.0-alpha11" +googleMaterial = "1.9.0" +agp = "8.1.0-beta01" espresso = "3.5.1" hilt = "2.45" axHilt = "1.0.0" -ktor = "2.2.4" +ktor = "2.3.0" lifecycle = "2.6.1" kotlin = "1.8.20" -binary_compat = "0.13.0" -mockito = "5.3.0" +binary_compat = "0.13.1" +mockito = "5.3.1" room = "2.5.1" spotless = "6.18.0" uiautomator = "2.2.0" @@ -27,7 +27,7 @@ serialization = "1.5.0" androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "axCore" } androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "axActivity" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "axAppcompat" } -androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha13" +androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha14" androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "axConstraintlayout" } androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "axDatastore" } androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" @@ -35,7 +35,7 @@ androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "axNavigation" } androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "axNavigation" } -androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.0" +androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1" androidx-recyclerview-selection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01" androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } @@ -55,11 +55,11 @@ coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", ve kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } coroutines-turbine = { module = "app.cash.turbine:turbine", version = "0.12.3" } -compose-activity = "androidx.activity:activity-compose:1.7.0" -compose-compiler = "androidx.compose.compiler:compiler:1.4.5" -compose-foundation = "androidx.compose.foundation:foundation:1.4.1" +compose-activity = "androidx.activity:activity-compose:1.7.1" +compose-compiler = "androidx.compose.compiler:compiler:1.4.6" +compose-foundation = "androidx.compose.foundation:foundation:1.4.3" compose-material3 = "androidx.compose.material3:material3:1.0.1" -compose-material-icons = "org.jetbrains.compose.material:material-icons-extended-desktop:1.3.1" +compose-material-icons = "org.jetbrains.compose.material:material-icons-extended-desktop:1.4.0" compose-theme-adapter = "com.google.accompanist:accompanist-themeadapter-material3:0.30.1" google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" } @@ -101,4 +101,4 @@ sentry = "io.sentry.android.gradle:3.5.0" [bundles] compose = ["compose-theme-adapter", "compose-activity", "compose-foundation", "compose-material3"] -testing = ["junit", "mockito-core", "mockito-kotlin", "kotlin-coroutines-test"] \ No newline at end of file +testing = ["junit", "mockito-core", "mockito-kotlin", "kotlin-coroutines-test"] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8196ca19..2c3425d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 30302278..df93647a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,7 @@ dependencyResolutionManagement { } } -plugins { id("com.gradle.enterprise") version "3.13" } +plugins { id("com.gradle.enterprise") version "3.13.1" } gradleEnterprise { buildScan {