Skip to content

Commit 294a68e

Browse files
graycreategraycreate
committed
Resolve merge conflict: update glide to 5.0.5
2 parents 360ce9e + f435cd9 commit 294a68e

23 files changed

+31
-81
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
@@ -74,10 +74,10 @@ jobs:
7474

7575
steps:
7676
- name: Checkout code
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@v5
7878

7979
- name: Set up JDK 17
80-
uses: actions/setup-java@v4
80+
uses: actions/setup-java@v5
8181
with:
8282
java-version: '17'
8383
distribution: 'temurin'
@@ -115,10 +115,10 @@ jobs:
115115

116116
steps:
117117
- name: Checkout code
118-
uses: actions/checkout@v4
118+
uses: actions/checkout@v5
119119

120120
- name: Set up JDK 17
121-
uses: actions/setup-java@v4
121+
uses: actions/setup-java@v5
122122
with:
123123
java-version: '17'
124124
distribution: 'temurin'
@@ -160,10 +160,10 @@ jobs:
160160

161161
steps:
162162
- name: Checkout code
163-
uses: actions/checkout@v4
163+
uses: actions/checkout@v5
164164

165165
- name: Set up JDK 17
166-
uses: actions/setup-java@v4
166+
uses: actions/setup-java@v5
167167
with:
168168
java-version: '17'
169169
distribution: 'temurin'

‎.github/workflows/claude-code-review-manual.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout PR
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
with:
3434
ref: refs/pull/${{ inputs.pr_number }}/merge
3535
fetch-depth: 0

‎.github/workflows/claude.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
actions: read # Required for Claude to read CI results on PRs
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
with:
3131
fetch-depth: 1
3232

‎.github/workflows/fastlane-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929

3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
- name: Set up JDK 17
35-
uses: actions/setup-java@v4
35+
uses: actions/setup-java@v5
3636
with:
3737
java-version: '17'
3838
distribution: 'temurin'

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout code
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v5
4949
with:
5050
fetch-depth: 2 # Need history for version comparison
5151
token: ${{ secrets.GITHUB_TOKEN }}
@@ -170,10 +170,10 @@ jobs:
170170

171171
steps:
172172
- name: Checkout code
173-
uses: actions/checkout@v4
173+
uses: actions/checkout@v5
174174

175175
- name: Set up JDK 17
176-
uses: actions/setup-java@v4
176+
uses: actions/setup-java@v5
177177
with:
178178
java-version: '17'
179179
distribution: 'temurin'
@@ -246,10 +246,10 @@ jobs:
246246

247247
steps:
248248
- name: Checkout code
249-
uses: actions/checkout@v4
249+
uses: actions/checkout@v5
250250

251251
- name: Set up JDK 17
252-
uses: actions/setup-java@v4
252+
uses: actions/setup-java@v5
253253
with:
254254
java-version: '17'
255255
distribution: 'temurin'
@@ -309,17 +309,17 @@ jobs:
309309

310310
steps:
311311
- name: Checkout code
312-
uses: actions/checkout@v4
312+
uses: actions/checkout@v5
313313

314314
- name: Download APK artifact
315-
uses: actions/download-artifact@v4
315+
uses: actions/download-artifact@v5
316316
with:
317317
name: release-apk
318318
path: release-artifacts/
319319

320320
- name: Download AAB artifact
321321
if: ${{ vars.ENABLE_SIGNING == 'true' }}
322-
uses: actions/download-artifact@v4
322+
uses: actions/download-artifact@v5
323323
with:
324324
name: release-bundle
325325
path: release-artifacts/
@@ -558,10 +558,10 @@ jobs:
558558

559559
steps:
560560
- name: Checkout code
561-
uses: actions/checkout@v4
561+
uses: actions/checkout@v5
562562

563563
- name: Download AAB artifact
564-
uses: actions/download-artifact@v4
564+
uses: actions/download-artifact@v5
565565
with:
566566
name: release-bundle
567567
path: release-artifacts/
@@ -923,10 +923,10 @@ jobs:
923923

924924
steps:
925925
- name: Checkout code
926-
uses: actions/checkout@v4
926+
uses: actions/checkout@v5
927927

928928
- name: Set up Python
929-
uses: actions/setup-python@v5
929+
uses: actions/setup-python@v6
930930
with:
931931
python-version: '3.x'
932932

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ dependencies {
7070
exclude group: 'com.google.code.findbugs'
7171
})
7272
testImplementation 'junit:junit:4.13.2'
73-
testImplementation 'org.mockito:mockito-core:5.18.0'
74-
testImplementation 'org.robolectric:robolectric:4.15.1'
73+
testImplementation 'org.mockito:mockito-core:5.20.0'
74+
testImplementation 'org.robolectric:robolectric:4.16'
7575
testImplementation 'androidx.test:core:1.7.0'
7676
testImplementation 'androidx.test.ext:junit:1.3.0'
7777

@@ -96,8 +96,8 @@ dependencies {
9696
def butterknifeVersion = '10.2.3'
9797
implementation "com.jakewharton:butterknife:10.2.3"
9898
annotationProcessor "com.jakewharton:butterknife-compiler:10.2.3"
99-
implementation 'com.google.dagger:dagger:2.57'
100-
annotationProcessor "com.google.dagger:dagger-compiler:2.57"
99+
implementation 'com.google.dagger:dagger:2.57.2'
100+
annotationProcessor "com.google.dagger:dagger-compiler:2.57.2"
101101
implementation 'com.github.bumptech.glide:glide:5.0.5'
102102
annotationProcessor 'com.github.bumptech.glide:compiler:5.0.5'
103103
implementation 'jp.wasabeef:glide-transformations:4.3.0'

‎app/src/main/ic_launcher-web.png‎

22.1 KB
Loading

‎app/src/main/res/drawable/ic_launcher_foreground.xml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_launcher_monochrome.xml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)