Skip to content

Commit 7976de1

Browse files
authored
Merge branch 'master' into dependabot/gradle/commons-codec-commons-codec-1.19.0
2 parents 9c4f70f + c0c8e5f commit 7976de1

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# These owners will be the default owners for everything in the repo.
22
# Unless a later match takes precedence,
33
# these owners will be requested for review when someone opens a pull request.
4-
* @DenBond7 @ioanmo226
4+
* @DenBond7 @ioanatflowcrypt
55

66
# The following files will no have codeowners to allow dependabot auto-merge
77
# based on https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features

.semaphore/semaphore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ agent:
55
type: e2-standard-2
66
os_image: ubuntu2404
77
execution_time_limit:
8-
minutes: 60
8+
minutes: 75
99

1010
fail_fast:
1111
stop:
@@ -194,4 +194,4 @@ after_pipeline:
194194
jobs:
195195
- name: Publish Results
196196
commands:
197-
- test-results gen-pipeline-report
197+
- test-results gen-pipeline-report

FlowCrypt/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,10 @@ dependencies {
420420
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.6.1")
421421
androidTestImplementation("androidx.test.espresso:espresso-intents:3.6.1")
422422
androidTestImplementation("androidx.test.espresso:espresso-web:3.6.1")
423-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
423+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
424424
androidTestImplementation("androidx.test:runner:1.6.2")
425425
androidTestImplementation("androidx.test:rules:1.6.1")
426-
androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
426+
androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0")
427427
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
428428
androidTestImplementation("androidx.room:room-testing:2.7.2")
429429
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
@@ -489,7 +489,7 @@ dependencies {
489489
implementation("com.squareup.retrofit2:retrofit:3.0.0")
490490
implementation("com.squareup.retrofit2:converter-gson:3.0.0")
491491
implementation("com.squareup.retrofit2:converter-scalars:3.0.0")
492-
implementation("com.squareup.okio:okio:3.13.0")
492+
implementation("com.squareup.okio:okio:3.16.0")
493493
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
494494

495495
implementation("com.github.bumptech.glide:glide:4.16.0")
@@ -498,11 +498,11 @@ dependencies {
498498
implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1")
499499
implementation("com.sandinh:zbase32-commons-codec_2.12:1.0.0")
500500
implementation("org.bitbucket.b_c:jose4j:0.9.6")
501-
implementation("org.jsoup:jsoup:1.20.1")
501+
implementation("org.jsoup:jsoup:1.21.1")
502502
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
503503
implementation("org.pgpainless:pgpainless-core:1.7.6")
504-
implementation("org.eclipse.angus:angus-mail:2.0.3")
505-
implementation("org.eclipse.angus:gimap:2.0.3")
504+
implementation("org.eclipse.angus:angus-mail:2.0.4")
505+
implementation("org.eclipse.angus:gimap:2.0.4")
506506
implementation("commons-io:commons-io:2.19.0")
507507
implementation("net.openid:appauth:0.11.1")
508508
implementation("ch.acra:acra-http:5.12.0")

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
id("com.starter.easylauncher") version "6.4.1" apply false
1313
id("org.jetbrains.kotlin.plugin.parcelize") version "2.2.10" apply false
1414
id("com.google.devtools.ksp") version "2.2.10-2.0.2" apply false
15-
id("org.ajoberstar.grgit") version "5.3.0" apply false
15+
id("org.ajoberstar.grgit") version "5.3.2" apply false
1616
}
1717

1818
subprojects {

0 commit comments

Comments
 (0)