diff --git a/.github/actions/gradle-task-with-commit/action.yml b/.github/actions/gradle-task-with-commit/action.yml index 1e01d520f2..bf41a202d3 100644 --- a/.github/actions/gradle-task-with-commit/action.yml +++ b/.github/actions/gradle-task-with-commit/action.yml @@ -29,12 +29,14 @@ inputs : runs: using: 'composite' steps: - - name: Check if PERSONAL_ACCESS_TOKEN is set + - name: Check if access token is set id: can-push shell: bash run: | if [[ "${{ inputs.personal-access-token }}" == '' ]]; then echo "can_push=false" >> $GITHUB_OUTPUT + elif [[ "${{ env.GITHUB_REF_PROTECTED }}" == 'true' ]]; then + echo "can_push=false" >> $GITHUB_OUTPUT elif [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then echo "can_push=false" >> $GITHUB_OUTPUT else diff --git a/.github/actions/gradle-task/action.yml b/.github/actions/gradle-task/action.yml index 855cac7473..9171e02394 100644 --- a/.github/actions/gradle-task/action.yml +++ b/.github/actions/gradle-task/action.yml @@ -64,7 +64,7 @@ runs : path : | ~/.gradle/caches/build-cache-1 ~/.konan - ./**/build + ./**/build/**/!(*.dex) ./**/.gradle key : ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}} restore-keys : | @@ -82,7 +82,7 @@ runs : path : | ~/.gradle/caches/build-cache-1 ~/.konan - ./**/build + ./**/build/**/!(*.dex) ./**/.gradle key : ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}} restore-keys : | @@ -117,7 +117,7 @@ runs : path : | ~/.gradle/caches/build-cache-1 ~/.konan - ./**/build + ./**/build/**/!(*.dex) ./**/.gradle key : ${{runner.os}}-${{inputs.write-cache-key}}-${{hashFiles('**/libs.versions.toml')}}-${{hashFiles('**/gradle.properties')}}-${{hashFiles('**/*.gradle.kts')}}-${{hashFiles('**/src/**/*.kt')}} diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml index 36915096f3..9c6c19df3d 100644 --- a/.github/workflows/kotlin.yml +++ b/.github/workflows/kotlin.yml @@ -50,6 +50,7 @@ jobs : with : check-task : connectedCheckShardMatrixYamlCheck checkVersionIsSnapshot fix-task : connectedCheckShardMatrixYamlUpdate checkVersionIsSnapshot + personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }} write-cache-key : build-logic artifacts-check : @@ -64,6 +65,7 @@ jobs : with : check-task : artifactsCheck fix-task : artifactsDump + personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }} write-cache-key : build-logic dependency-guard : @@ -79,6 +81,7 @@ jobs : with : check-task : dependencyGuard --refresh-dependencies fix-task : dependencyGuardBaseline --refresh-dependencies + personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }} write-cache-key : build-logic ktlint : @@ -94,6 +97,7 @@ jobs : with : check-task : ktLintCheck fix-task : ktLintFormat + personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }} write-cache-key : build-logic api-check : @@ -109,6 +113,7 @@ jobs : with : check-task : apiCheck fix-task : apiDump + personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }} write-cache-key : build-logic android-lint : diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b757a4c6a5..67c63c190a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,7 +83,7 @@ squareup-workflow = "1.0.0" timber = "4.7.1" truth = "1.1.5" -turbine = "0.13.0" +turbine = "1.0.0" vanniktech-publish = "0.22.0" [plugins] diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt index e28f00ccab..c0c152c04f 100644 --- a/workflow-testing/dependencies/runtimeClasspath.txt +++ b/workflow-testing/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ -app.cash.turbine:turbine-jvm:0.13.0 -app.cash.turbine:turbine:0.13.0 +app.cash.turbine:turbine-jvm:1.0.0 +app.cash.turbine:turbine:1.0.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 org.jetbrains.kotlin:kotlin-reflect:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10