Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from connectbot:main #281

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

[pull] main from connectbot:main #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e3577fc
Bump reactivecircus/android-emulator-runner from 2.31.0 to 2.32.0
dependabot[bot] Jul 15, 2024
9f1df62
Automated translations import
Jul 19, 2024
d524511
Automated translations import
Nov 6, 2024
6f50450
Bump reactivecircus/android-emulator-runner from 2.32.0 to 2.33.0
dependabot[bot] Oct 14, 2024
62b83d0
Bump peter-evans/create-pull-request from 6 to 7
dependabot[bot] Sep 9, 2024
f95530e
Bump gradle/actions from 3 to 4
dependabot[bot] Aug 5, 2024
2ce7ce1
Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
dependabot[bot] Jul 9, 2024
a4f2c00
Bump testRunnerVersion from 1.4.1 to 1.5.0
dependabot[bot] Jun 24, 2024
f995659
Bump net.ltgt.errorprone from 4.0.1 to 4.1.0
dependabot[bot] Dec 4, 2024
f440c64
Bump org.robolectric:robolectric from 4.12.2 to 4.14.1
dependabot[bot] Dec 4, 2024
a95fa79
Bump org.conscrypt:conscrypt-android from 2.5.2 to 2.5.3
dependabot[bot] Dec 5, 2024
0b1eb2b
Bump org.mockito:mockito-core from 5.12.0 to 5.14.2
dependabot[bot] Dec 5, 2024
b2b06f0
Bump com.google.errorprone:error_prone_core from 2.28.0 to 2.36.0
dependabot[bot] Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Setup Android SDK
uses: android-actions/setup-android@v3
Expand All @@ -52,7 +52,7 @@ jobs:
run: ./gradlew build bundleGoogleRelease

- name: Run instrument tests
uses: reactivecircus/android-emulator-runner@v2.31.0
uses: reactivecircus/android-emulator-runner@v2.33.0
with:
api-level: 28
target: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v3
- uses: gradle/actions/wrapper-validation@v4
4 changes: 2 additions & 2 deletions .github/workflows/translations-import.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ jobs:
echo $REVNO > "${GITHUB_WORKSPACE}/${PO_SUBDIR}/.revno"

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Try importing the translations
run: |
TRANSLATIONS_ONLY=1 ./gradlew :translations:importToAndroid

- name: Create pull request
if: github.event_name != 'pull_request'
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: |
Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ buildscript {
plugins {
id 'com.android.application' version '8.1.4'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'net.ltgt.errorprone' version '4.0.1'
id 'net.ltgt.errorprone' version '4.1.0'
id 'com.gladed.androidgitversion' version '0.4.14'
id 'com.github.kt3k.coveralls' version '2.12.2'
id 'com.mxalbert.gradle.jacoco-android' version '0.2.1'
id 'com.starter.easylauncher' version '6.4.0'
}

ext {
testRunnerVersion = '1.4.1'
testRunnerVersion = '1.5.0'
espressoVersion = '3.5.1'
}

Expand Down Expand Up @@ -211,7 +211,7 @@ dependencyUpdates {
dependencies {
implementation 'org.connectbot:sshlib:2.2.23'
googleImplementation 'com.google.android.gms:play-services-basement:18.3.0'
ossImplementation 'org.conscrypt:conscrypt-android:2.5.2'
ossImplementation 'org.conscrypt:conscrypt-android:2.5.3'

implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation 'androidx.appcompat:appcompat:1.6.1'
Expand All @@ -232,15 +232,15 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "androidx.test:core:1.5.0"
testImplementation "androidx.test.ext:junit:1.1.5"
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.assertj:assertj-core:3.26.0'
testImplementation 'org.robolectric:robolectric:4.12.2'
testImplementation 'org.mockito:mockito-core:5.14.2'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'org.robolectric:robolectric:4.14.1'

// Needed for robolectric tests
testCompileOnly 'org.conscrypt:conscrypt-openjdk-uber:2.5.2'
testRuntimeOnly 'org.conscrypt:conscrypt-android:2.5.2'
testRuntimeOnly 'org.conscrypt:conscrypt-android:2.5.3'
testImplementation 'org.conscrypt:conscrypt-openjdk-uber:2.5.2'

errorprone "com.google.errorprone:error_prone_core:2.28.0"
errorprone "com.google.errorprone:error_prone_core:2.36.0"
}

2 changes: 1 addition & 1 deletion app/locale/.revno
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
36
38
Loading
Loading