Skip to content

Commit 43fc0a6

Browse files
authored
Merge pull request #1069 from square/renovate/major-turbine
Update dependency app.cash.turbine:turbine to v1
2 parents 35fa125 + 65d5d74 commit 43fc0a6

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.github/actions/gradle-task-with-commit/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ inputs :
2929
runs:
3030
using: 'composite'
3131
steps:
32-
- name: Check if PERSONAL_ACCESS_TOKEN is set
32+
- name: Check if access token is set
3333
id: can-push
3434
shell: bash
3535
run: |
3636
if [[ "${{ inputs.personal-access-token }}" == '' ]]; then
3737
echo "can_push=false" >> $GITHUB_OUTPUT
38+
elif [[ "${{ env.GITHUB_REF_PROTECTED }}" == 'true' ]]; then
39+
echo "can_push=false" >> $GITHUB_OUTPUT
3840
elif [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then
3941
echo "can_push=false" >> $GITHUB_OUTPUT
4042
else

.github/actions/gradle-task/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ runs :
6464
path : |
6565
~/.gradle/caches/build-cache-1
6666
~/.konan
67-
./**/build
67+
./**/build/**/!(*.dex)
6868
./**/.gradle
6969
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}}
7070
restore-keys : |
@@ -82,7 +82,7 @@ runs :
8282
path : |
8383
~/.gradle/caches/build-cache-1
8484
~/.konan
85-
./**/build
85+
./**/build/**/!(*.dex)
8686
./**/.gradle
8787
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}}
8888
restore-keys : |
@@ -117,7 +117,7 @@ runs :
117117
path : |
118118
~/.gradle/caches/build-cache-1
119119
~/.konan
120-
./**/build
120+
./**/build/**/!(*.dex)
121121
./**/.gradle
122122
key : ${{runner.os}}-${{inputs.write-cache-key}}-${{hashFiles('**/libs.versions.toml')}}-${{hashFiles('**/gradle.properties')}}-${{hashFiles('**/*.gradle.kts')}}-${{hashFiles('**/src/**/*.kt')}}
123123

.github/workflows/kotlin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs :
5050
with :
5151
check-task : connectedCheckShardMatrixYamlCheck checkVersionIsSnapshot
5252
fix-task : connectedCheckShardMatrixYamlUpdate checkVersionIsSnapshot
53+
personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }}
5354
write-cache-key : build-logic
5455

5556
artifacts-check :
@@ -64,6 +65,7 @@ jobs :
6465
with :
6566
check-task : artifactsCheck
6667
fix-task : artifactsDump
68+
personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }}
6769
write-cache-key : build-logic
6870

6971
dependency-guard :
@@ -79,6 +81,7 @@ jobs :
7981
with :
8082
check-task : dependencyGuard --refresh-dependencies
8183
fix-task : dependencyGuardBaseline --refresh-dependencies
84+
personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }}
8285
write-cache-key : build-logic
8386

8487
ktlint :
@@ -94,6 +97,7 @@ jobs :
9497
with :
9598
check-task : ktLintCheck
9699
fix-task : ktLintFormat
100+
personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }}
97101
write-cache-key : build-logic
98102

99103
api-check :
@@ -109,6 +113,7 @@ jobs :
109113
with :
110114
check-task : apiCheck
111115
fix-task : apiDump
116+
personal-access-token: ${{ secrets.PR_UPDATE_TOKEN }}
112117
write-cache-key : build-logic
113118

114119
android-lint :

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ squareup-workflow = "1.0.0"
8383

8484
timber = "4.7.1"
8585
truth = "1.1.5"
86-
turbine = "0.13.0"
86+
turbine = "1.0.0"
8787
vanniktech-publish = "0.22.0"
8888

8989
[plugins]

workflow-testing/dependencies/runtimeClasspath.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
app.cash.turbine:turbine-jvm:0.13.0
2-
app.cash.turbine:turbine:0.13.0
1+
app.cash.turbine:turbine-jvm:1.0.0
2+
app.cash.turbine:turbine:1.0.0
33
com.squareup.okio:okio-jvm:3.0.0
44
com.squareup.okio:okio:3.0.0
55
org.jetbrains.kotlin:kotlin-bom:1.8.10
66
org.jetbrains.kotlin:kotlin-reflect:1.8.10
7-
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
7+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
88
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10
99
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10
1010
org.jetbrains.kotlin:kotlin-stdlib:1.8.10

0 commit comments

Comments
 (0)