Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2022-05-20 13:58:33 +0300
committerStefan Niedermann <info@niedermann.it>2022-05-20 13:58:33 +0300
commit766d850f680200224dd6327a13d69e6b83d4cc2b (patch)
tree7c88b6b56d5f4cd32dbc49a328de397ff2b21a6d
parentd043b05367783235d4892b7aceb5c0f68cd2975a (diff)
parent1aafd0099f6939537c1663240b45c868d847e391 (diff)
Merge remote-tracking branch 'origin/1504-sort-notes-using-locale-sorting-rules' into 1504-sort-notes-using-locale-sorting-rules
-rw-r--r--.github/workflows/codeql.yml4
-rw-r--r--app/build.gradle10
2 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 871fdb8e..d06291f0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,10 +18,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
with:
languages: java
- name: Build debug APK
run: bash ./gradlew assembleDev --stacktrace
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
diff --git a/app/build.gradle b/app/build.gradle
index 2b905a72..e929e73f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,8 +87,8 @@ dependencies {
}
// Glide
- implementation 'com.github.bumptech.glide:glide:4.13.1'
- annotationProcessor 'com.github.bumptech.glide:compiler:4.13.1'
+ implementation 'com.github.bumptech.glide:glide:4.13.2'
+ annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
// Android X
implementation 'androidx.appcompat:appcompat:1.4.1'
@@ -98,7 +98,7 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.work:work-runtime:2.7.1'
- implementation 'com.google.android.material:material:1.5.0'
+ implementation 'com.google.android.material:material:1.6.0'
// Database
implementation 'androidx.room:room-runtime:2.4.2'
@@ -117,8 +117,8 @@ dependencies {
testImplementation 'androidx.test:core:1.4.0'
testImplementation 'androidx.arch.core:core-testing:2.1.0'
testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.mockito:mockito-core:4.5.0'
- testImplementation 'org.robolectric:robolectric:4.7.3'
+ testImplementation 'org.mockito:mockito-core:4.5.1'
+ testImplementation 'org.robolectric:robolectric:4.8.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
}