Skip to content

Commit 1066ec4

Browse files
Merge pull request #5639 from simpledotorg/master
2 parents 8d48694 + 06b71ba commit 1066ec4

File tree

11 files changed

+14
-15
lines changed

11 files changed

+14
-15
lines changed

.github/workflows/benchmark_suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v5
2525

2626
- name: Setup JDK
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
distribution: 'zulu'
3030
java-version: 17

.github/workflows/build_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v5
4747

4848
- name: Setup JDK
49-
uses: actions/setup-java@v4
49+
uses: actions/setup-java@v5
5050
with:
5151
java-version: 17
5252
distribution: zulu

.github/workflows/build_sandbox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/checkout@v5
4646

4747
- name: Setup JDK
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
5050
java-version: 17
5151
distribution: zulu

.github/workflows/build_staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/checkout@v5
4646

4747
- name: Setup JDK
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
5050
java-version: 17
5151
distribution: zulu

.github/workflows/ci_checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@v5
4747

4848
- name: Setup JDK
49-
uses: actions/setup-java@v4
49+
uses: actions/setup-java@v5
5050
with:
5151
distribution: 'zulu'
5252
java-version: 17
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/checkout@v5
6262

6363
- name: Setup JDK
64-
uses: actions/setup-java@v4
64+
uses: actions/setup-java@v5
6565
with:
6666
distribution: 'zulu'
6767
java-version: 17
@@ -116,7 +116,7 @@ jobs:
116116
script: echo "Generated AVD snapshot for caching."
117117

118118
- name: set up JDK
119-
uses: actions/setup-java@v4
119+
uses: actions/setup-java@v5
120120
with:
121121
distribution: 'zulu'
122122
java-version: 17

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
- Bump Compose BOM to v2025.09.01
2828
- Bump Sentry Android to v5.12.0
2929
- Update GH Actions `checkout` to v5
30+
- Update GH Actions `setup-jdk` to to v5
31+
- Bump Gradle to v9.1.0
32+
- Bump Mockito Kotlin to v6.0.0
3033

3134
### Changes
3235

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ lottie = "com.airbnb.android:lottie-compose:6.6.9"
142142

143143
material = "com.google.android.material:material:1.13.0"
144144

145-
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0"
145+
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.0.0"
146146

147147
mobius-android = { module = "com.spotify.mobius:mobius-android", version.ref = "mobius" }
148148
mobius-core = { module = "com.spotify.mobius:mobius-core", version.ref = "mobius" }

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)