Skip to content

Commit 0a67153

Browse files
Changes before error encountered
Co-authored-by: MinecraftFuns <[email protected]>
1 parent ad620ea commit 0a67153

File tree

9 files changed

+47
-47
lines changed

9 files changed

+47
-47
lines changed

.github/workflows/android-ui.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
ref: ${{ github.event.workflow_run.head_sha }}
2626
fetch-depth: 0 # Full git history for version calculation
@@ -33,7 +33,7 @@ jobs:
3333
sudo udevadm trigger --name-match=kvm
3434
3535
- name: Set up JDK
36-
uses: actions/setup-java@v4
36+
uses: actions/setup-java@v5
3737
with:
3838
distribution: temurin
3939
java-version: "21"
@@ -56,7 +56,7 @@ jobs:
5656
targets: x86_64-linux-android
5757

5858
- name: Cache Cargo dependencies
59-
uses: actions/cache@v4
59+
uses: actions/cache@v5
6060
with:
6161
path: |
6262
~/.cargo/bin/
@@ -108,7 +108,7 @@ jobs:
108108
find ${{ github.workspace }}/app/src/main/jniLibs -type f -name "*letterbox_proxy*.so" | head -1 || (echo "ERROR: letterbox_proxy not found!" && exit 1)
109109
110110
- name: Set up Gradle
111-
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
111+
uses: gradle/actions/setup-gradle@v5.0.0
112112

113113
- name: Run instrumented UI tests (Gradle Managed Devices)
114114
run: |
@@ -142,7 +142,7 @@ jobs:
142142
143143
- name: Upload test artifacts
144144
if: always()
145-
uses: actions/upload-artifact@v4
145+
uses: actions/upload-artifact@v6
146146
with:
147147
name: android-ui-test-artifacts
148148
path: artifacts/

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
with:
3535
fetch-depth: 0 # Full git history for version calculation
3636
fetch-tags: true
@@ -56,7 +56,7 @@ jobs:
5656
echo "Build type: $CI_BUILD_TYPE"
5757
5858
- name: Set up JDK
59-
uses: actions/setup-java@v4
59+
uses: actions/setup-java@v5
6060
with:
6161
distribution: temurin
6262
java-version: "21"
@@ -77,7 +77,7 @@ jobs:
7777
targets: aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android
7878

7979
- name: Cache Gradle dependencies
80-
uses: actions/cache@v4
80+
uses: actions/cache@v5
8181
with:
8282
path: |
8383
~/.gradle/caches
@@ -87,7 +87,7 @@ jobs:
8787
gradle-${{ runner.os }}-
8888
8989
- name: Cache Cargo dependencies
90-
uses: actions/cache@v4
90+
uses: actions/cache@v5
9191
with:
9292
path: |
9393
~/.cargo/bin/
@@ -151,7 +151,7 @@ jobs:
151151
prod-release-artifact-name: ${{ steps.artifact-names.outputs.prod-release }}
152152
steps:
153153
- name: Checkout
154-
uses: actions/checkout@v4
154+
uses: actions/checkout@v6
155155
with:
156156
fetch-depth: 0 # Full git history for version calculation
157157
fetch-tags: true
@@ -174,7 +174,7 @@ jobs:
174174
echo "Build type: $CI_BUILD_TYPE"
175175
176176
- name: Set up JDK
177-
uses: actions/setup-java@v4
177+
uses: actions/setup-java@v5
178178
with:
179179
distribution: temurin
180180
java-version: "21"
@@ -206,7 +206,7 @@ jobs:
206206
run: chmod +x gradlew
207207

208208
- name: Set up Gradle
209-
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
209+
uses: gradle/actions/setup-gradle@v5.0.0
210210

211211
- name: Build Android native libraries (letterbox-core)
212212
run: |
@@ -250,21 +250,21 @@ jobs:
250250
echo "prod-release=letterbox-prod-release-unsigned-apk" >> $GITHUB_OUTPUT
251251
252252
- name: Upload test APK artifact
253-
uses: actions/upload-artifact@v4
253+
uses: actions/upload-artifact@v6
254254
with:
255255
name: ${{ steps.artifact-names.outputs.test }}
256256
path: app/build/outputs/apk/staging/debug/*.apk
257257
retention-days: 30
258258

259259
- name: Upload prod release APK artifact
260-
uses: actions/upload-artifact@v4
260+
uses: actions/upload-artifact@v6
261261
with:
262262
name: ${{ steps.artifact-names.outputs.prod-release }}
263263
path: app/build/outputs/apk/prod/release/*.apk
264264
retention-days: 30
265265

266266
- name: Upload test androidTest APK artifact
267-
uses: actions/upload-artifact@v4
267+
uses: actions/upload-artifact@v6
268268
with:
269269
name: letterbox-staging-androidTest-apk
270270
path: app/build/outputs/apk/androidTest/staging/debug/*.apk

.github/workflows/pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main' }}
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with:
2424
ref: ${{ github.event.workflow_run.head_sha }}
2525
fetch-depth: 0 # Full git history for version calculation
@@ -33,7 +33,7 @@ jobs:
3333
sdkmanager "build-tools;34.0.0"
3434
3535
- name: Download prod release APK from build workflow
36-
uses: actions/download-artifact@v4
36+
uses: actions/download-artifact@v7
3737
with:
3838
name: letterbox-prod-release-unsigned-apk
3939
path: ./artifacts

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
echo "Release tag '$TAG_NAME' is valid"
2727
2828
- name: Checkout
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0 # Full git history for version calculation
3232
fetch-tags: true
3333

3434
- name: Set up JDK
35-
uses: actions/setup-java@v4
35+
uses: actions/setup-java@v5
3636
with:
3737
distribution: temurin
3838
java-version: "21"
@@ -53,7 +53,7 @@ jobs:
5353
targets: aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android
5454

5555
- name: Cache Gradle dependencies
56-
uses: actions/cache@v4
56+
uses: actions/cache@v5
5757
with:
5858
path: |
5959
~/.gradle/caches
@@ -63,7 +63,7 @@ jobs:
6363
gradle-${{ runner.os }}-
6464
6565
- name: Cache Cargo dependencies
66-
uses: actions/cache@v4
66+
uses: actions/cache@v5
6767
with:
6868
path: |
6969
~/.cargo/bin/
@@ -114,7 +114,7 @@ jobs:
114114
unzip -l app/build/outputs/apk/prod/release/*.apk "lib/*/*.so" || (echo "ERROR: No .so files found in prod release APK!" && exit 1)
115115
116116
- name: Upload release APK artifact
117-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@v6
118118
with:
119119
name: letterbox-prod-release-unsigned-apk
120120
path: app/build/outputs/apk/prod/release/*.apk
@@ -136,7 +136,7 @@ jobs:
136136
sdkmanager "build-tools;34.0.0"
137137
138138
- name: Download release APK
139-
uses: actions/download-artifact@v4
139+
uses: actions/download-artifact@v7
140140
with:
141141
name: letterbox-prod-release-unsigned-apk
142142
path: ./artifacts

.github/workflows/sign-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
sdkmanager "build-tools;34.0.0"
2929
3030
- name: Download test APK from build workflow
31-
uses: actions/download-artifact@v4
31+
uses: actions/download-artifact@v7
3232
with:
3333
name: letterbox-staging-apk
3434
path: ./artifacts
@@ -67,7 +67,7 @@ jobs:
6767
rm -f "$UNSIGNED_APK"
6868
6969
- name: Upload signed test APK artifact
70-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v6
7171
with:
7272
name: letterbox-staging-signed-apk
7373
path: ./artifacts/*.apk

app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,15 +367,15 @@ dependencies {
367367
testImplementation(kotlin("test-junit"))
368368
testImplementation(libs.coroutines.test)
369369
testImplementation(libs.robolectric)
370-
testImplementation("net.java.dev.jna:jna:5.14.0")
370+
testImplementation("net.java.dev.jna:jna:5.18.1")
371371

372372
androidTestImplementation(platform(libs.compose.bom))
373373
androidTestImplementation(libs.androidx.test.ext)
374374
androidTestImplementation(libs.espresso.core)
375375
androidTestImplementation(libs.compose.ui.test.junit4)
376-
androidTestImplementation("androidx.test:core:1.5.0")
377-
androidTestImplementation("androidx.test:runner:1.5.2")
378-
androidTestImplementation("androidx.test:rules:1.5.0")
376+
androidTestImplementation("androidx.test:core:1.7.0")
377+
androidTestImplementation("androidx.test:runner:1.7.0")
378+
androidTestImplementation("androidx.test:rules:1.7.0")
379379

380380
debugImplementation(libs.compose.ui.tooling)
381381
debugImplementation(libs.compose.ui.test.manifest)

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[versions]
2-
agp = "8.8.0"
3-
kotlin = "2.0.21"
4-
coreKtx = "1.13.1"
5-
coroutines = "1.9.0"
6-
composeBom = "2024.12.01"
7-
activityCompose = "1.9.3"
8-
lifecycleRuntimeKtx = "2.8.6"
9-
room = "2.6.1"
10-
datastore = "1.1.1"
11-
robolectric = "4.11.1"
2+
agp = "9.0.0"
3+
kotlin = "2.3.0"
4+
coreKtx = "1.17.0"
5+
coroutines = "1.10.2"
6+
composeBom = "2026.01.00"
7+
activityCompose = "1.12.2"
8+
lifecycleRuntimeKtx = "2.10.0"
9+
room = "2.8.4"
10+
datastore = "1.2.0"
11+
robolectric = "4.16"
1212
junit4 = "4.13.2"
13-
androidxTestExt = "1.1.5"
14-
espressoCore = "3.5.1"
15-
material = "1.12.0"
16-
jna = "5.14.0"
13+
androidxTestExt = "1.3.0"
14+
espressoCore = "3.7.0"
15+
material = "1.13.0"
16+
jna = "5.18.1"
1717

1818
[libraries]
1919
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }

rust/letterbox-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name = "uniffi-bindgen"
1212
path = "uniffi-bindgen.rs"
1313

1414
[dependencies]
15-
thiserror = "1.0"
15+
thiserror = "2.0.17"
1616
mail-parser = "0.11.1"
1717
uniffi = { version = "0.30.0", features = ["cli"] }
1818
scraper = "0.21.0"

rust/letterbox-proxy/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mock = []
2020

2121
[dependencies]
2222
# Error handling
23-
thiserror = "1.0"
23+
thiserror = "2.0.17"
2424
anyhow = "1.0"
2525

2626
# Async runtime
@@ -31,7 +31,7 @@ futures = "0.3"
3131
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "cookies"] }
3232

3333
# Cryptography for WireGuard key generation (use the version boringtun needs)
34-
x25519-dalek = "=2.0.0-rc.3"
34+
x25519-dalek = "2.0.0"
3535
base64 = "0.22"
3636
rand = "0.8"
3737

@@ -60,7 +60,7 @@ env_logger = "0.11"
6060
uniffi = { version = "0.30.0", features = ["cli"] }
6161

6262
# Caching
63-
lru = "0.12"
63+
lru = "0.16.3"
6464

6565
# Time handling
6666
chrono = { version = "0.4", default-features = false, features = ["std", "clock"] }

0 commit comments

Comments
 (0)