Skip to content

Commit a758a9b

Browse files
authored
Merge branch 'master' into android-native
2 parents bbbb038 + d752843 commit a758a9b

6 files changed

Lines changed: 22 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131

3232
- name: Validate Gradle Wrapper
3333
uses: gradle/actions/wrapper-validation@v5
@@ -51,7 +51,7 @@ jobs:
5151
sudo udevadm control --reload-rules
5252
sudo udevadm trigger --name-match=kvm
5353
ls /dev/kvm
54-
- uses: actions/checkout@v5
54+
- uses: actions/checkout@v6
5555
- uses: actions/setup-java@v5
5656
with:
5757
distribution: 'zulu'
@@ -72,7 +72,7 @@ jobs:
7272

7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v5
75+
uses: actions/checkout@v6
7676

7777
- name: Validate Gradle Wrapper
7878
uses: gradle/actions/wrapper-validation@v5
@@ -96,7 +96,7 @@ jobs:
9696

9797
steps:
9898
- name: Checkout
99-
uses: actions/checkout@v5
99+
uses: actions/checkout@v6
100100

101101
- name: Validate Gradle Wrapper
102102
uses: gradle/actions/wrapper-validation@v5
@@ -118,7 +118,7 @@ jobs:
118118
119119
- name: Save Test Reports
120120
if: failure()
121-
uses: actions/upload-artifact@v5
121+
uses: actions/upload-artifact@v6
122122
with:
123123
name: test-reports
124124
path: '**/build/reports'
@@ -130,7 +130,7 @@ jobs:
130130

131131
steps:
132132
- name: Checkout
133-
uses: actions/checkout@v5
133+
uses: actions/checkout@v6
134134

135135
- uses: actions/setup-java@v5
136136
with:
@@ -153,7 +153,7 @@ jobs:
153153

154154
steps:
155155
- name: Checkout
156-
uses: actions/checkout@v5
156+
uses: actions/checkout@v6
157157
with:
158158
fetch-depth: 0
159159

@@ -165,7 +165,7 @@ jobs:
165165
- name: Set up Python
166166
uses: actions/setup-python@v6
167167
with:
168-
python-version: 3.8
168+
python-version: 3.14
169169

170170
- name: Prepare docs
171171
run: .buildscript/prepare_mkdocs.sh

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: macos-15
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- uses: actions/setup-java@v5
1818
with:
1919
distribution: 'zulu'

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ Change Log
55

66
* None yet.
77

8-
## Version 3.16.3
8+
## Version 3.16.4
99

10-
_2025-11-14_
10+
_2025-11-17_
1111

1212
* Fix: Don't delay triggering timeouts. In 3.16.0 we introduced a regression that caused timeouts
1313
to fire later than they were supposed to.
1414

1515

16+
## Version 3.16.3
17+
18+
_2025-11-14_
19+
20+
This release is the same as 3.16.2. We forgot to cherry-pick a commit before we released!
21+
22+
1623
## Version 3.16.2
1724

1825
_2025-10-14_

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ ktlint = "0.48.2"
66

77
[libraries]
88
android-desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
9-
android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "9.0.0-beta01" }
9+
android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "9.0.0" }
1010
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
1111
androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
1212
binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version = "0.18.1" }
13-
bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.1.0" }
13+
bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.2.1" }
1414
burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version.ref = "burst" }
1515
burst-runtime = { module = "app.cash.burst:burst", version.ref = "burst" }
1616
dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "2.1.0" }
@@ -26,4 +26,4 @@ test-assertj = { module = "org.assertj:assertj-core", version = "3.27.6" }
2626
test-assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
2727
test-jimfs = "com.google.jimfs:jimfs:1.3.1"
2828
test-junit = { module = "junit:junit", version = "4.13.2" }
29-
vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.35.0" }
29+
vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.36.0" }

gradle/wrapper/gradle-wrapper.jar

542 Bytes
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-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)