diff options
| author | David Luhmer <david-dev@live.de> | 2022-07-29 19:52:42 +0300 |
|---|---|---|
| committer | David Luhmer <david-dev@live.de> | 2022-07-29 19:52:42 +0300 |
| commit | 493ce83c6e71268a9bf4a11ce8ddbf4d9d0763b6 (patch) | |
| tree | b4d8469fc69dc714347dae9fadf902a3594551f7 | |
| parent | e4185d80d28ceed9d0f39cf9484349d0d9afa83c (diff) | |
| parent | 999f0db1737fd14bb2beabf7c76b3bdeacb63532 (diff) | |
Merge branch 'master' of https://github.com/nextcloud/news-android
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | News-Android-App/build.gradle | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0135cc89..09517abd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: set up JDK 11 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'adopt' java-version: 11 @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: set up JDK 11 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'adopt' java-version: 11 @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: set up JDK 11 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'adopt' java-version: 11 diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index 569e3f42..2ab61945 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -112,7 +112,7 @@ repositories { maven { url 'https://guardian.github.io/maven/repo-releases' } //needed for com.gu:option:1.3 in Android-DirectoryChooser } -final DAGGER_VERSION = '2.41' +final DAGGER_VERSION = '2.42' final ESPRESSO_VERSION = '3.4.0' final OKHTTP_VERSION = '3.12.13' final MOCKITO_VERSION = '3.8.0' @@ -144,7 +144,7 @@ dependencies { //implementation 'de.mrmaffen:holocircularprogressbar:1.0.1' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.code.gson:gson:2.9.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.sothree.slidinguppanel:library:3.4.0' |