Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 78aad20

Browse files
committed
Merge branch 'develop' into FabianHenneke-patch-1
* develop: build: uprev all dependencies (#882)
2 parents fd2d9c2 + 2f7c501 commit 78aad20

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@
3131
# Tink (for security-crypto)
3232
# I'm most certainly not a fan of this catch-all rule
3333
-keep class com.google.crypto.tink.proto.** { *; }
34+
35+
# WhatTheStack
36+
-keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {
37+
<init>();
38+
}

dependencies.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ ext.deps = [
2727
annotation: 'androidx.annotation:annotation:1.2.0-alpha01',
2828
activity_ktx: 'androidx.activity:activity-ktx:1.2.0-alpha06',
2929
appcompat: 'androidx.appcompat:appcompat:1.3.0-alpha01',
30-
biometric: 'androidx.biometric:biometric:1.0.1',
31-
constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta6',
30+
biometric: 'androidx.biometric:biometric:1.1.0-alpha01',
31+
constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta7',
3232
core_ktx: 'androidx.core:core-ktx:1.5.0-alpha01',
3333
documentfile: 'androidx.documentfile:documentfile:1.0.1',
3434
fragment_ktx: 'androidx.fragment:fragment-ktx:1.3.0-alpha06',
35-
lifecycle_common: 'androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha04',
36-
lifecycle_livedata_ktx: 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha04',
37-
lifecycle_viewmodel_ktx: 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha04',
35+
lifecycle_common: 'androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha05',
36+
lifecycle_livedata_ktx: 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha05',
37+
lifecycle_viewmodel_ktx: 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha05',
3838
material: 'com.google.android.material:material:1.3.0-alpha01',
3939
preference: 'androidx.preference:preference:1.1.1',
40-
recycler_view: 'androidx.recyclerview:recyclerview:1.2.0-alpha03',
40+
recycler_view: 'androidx.recyclerview:recyclerview:1.2.0-alpha04',
4141
recycler_view_selection: 'androidx.recyclerview:recyclerview-selection:1.1.0-rc01',
4242
security: 'androidx.security:security-crypto:1.1.0-alpha01',
43-
swiperefreshlayout: 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
43+
swiperefreshlayout: 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
4444
],
4545

4646
third_party: [
47-
bouncycastle: 'org.bouncycastle:bcprov-jdk15on:1.65',
47+
bouncycastle: 'org.bouncycastle:bcprov-jdk15on:1.65.01',
4848
fastscroll: 'me.zhanghai.android.fastscroll:library:1.1.4',
4949
jsch: 'com.jcraft:jsch:0.1.55',
5050
jgit: 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r',
@@ -55,7 +55,7 @@ ext.deps = [
5555
ssh_auth: 'org.sufficientlysecure:sshauthentication-api:1.0',
5656
timber: 'com.jakewharton.timber:timber:4.7.1',
5757
timberkt: 'com.github.ajalt:timberkt:1.5.1',
58-
whatthestack: 'com.github.haroldadmin:WhatTheStack:0.0.2',
58+
whatthestack: 'com.github.haroldadmin:WhatTheStack:0.0.3',
5959
],
6060

6161
testing: [

0 commit comments

Comments
 (0)