Skip to content

Commit fc12500

Browse files
committed
Build: Update dependencies and bump minSdk to 23 due to that
1 parent c18b627 commit fc12500

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

app/build.gradle

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ buildscript {
1515
mavenCentral()
1616
}
1717
dependencies {
18-
classpath 'com.google.gms:google-services:4.4.3'
19-
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.5'
18+
classpath 'com.google.gms:google-services:4.4.4'
19+
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.6'
2020
}
2121
}
2222
apply plugin: 'com.google.gms.google-services'
@@ -30,7 +30,7 @@ android {
3030
ndkVersion '28.1.13356709'
3131
defaultConfig {
3232
applicationId 'me.zhanghai.android.files'
33-
minSdk 21
33+
minSdk 23
3434
// Not supporting foreground service timeout yet.
3535
//noinspection OldTargetApi
3636
targetSdk 34
@@ -126,36 +126,38 @@ dependencies {
126126
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
127127
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
128128

129-
implementation 'androidx.activity:activity-ktx:1.10.1'
129+
implementation 'androidx.activity:activity-ktx:1.13.0'
130130
implementation 'androidx.appcompat:appcompat:1.7.1'
131-
implementation 'androidx.core:core-ktx:1.16.0'
131+
implementation 'androidx.core:core-ktx:1.18.0'
132132
implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
133-
implementation 'androidx.exifinterface:exifinterface:1.4.1'
134-
implementation 'androidx.fragment:fragment-ktx:1.8.8'
135-
def androidx_lifecycle_version = '2.9.2'
133+
implementation 'androidx.exifinterface:exifinterface:1.4.2'
134+
implementation 'androidx.fragment:fragment-ktx:1.8.9'
135+
def androidx_lifecycle_version = '2.10.0'
136136
implementation "androidx.lifecycle:lifecycle-common-java8:$androidx_lifecycle_version"
137137
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidx_lifecycle_version"
138138
implementation "androidx.lifecycle:lifecycle-process:$androidx_lifecycle_version"
139139
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_version"
140140
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version"
141141
implementation 'androidx.preference:preference-ktx:1.2.1'
142142
implementation 'androidx.recyclerview:recyclerview:1.4.0'
143-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
144-
implementation 'com.google.android.material:material:1.12.0'
143+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
144+
implementation 'com.google.android.material:material:1.13.0'
145145

146146
implementation 'com.caverock:androidsvg-aar:1.4'
147147
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
148148
implementation 'com.drakeet.drawer:drawer:1.0.3'
149149
implementation 'com.h6ah4i.android.materialshadowninepatch:materialshadowninepatch:1.0.0'
150150
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
151-
// SMBJ 0.12.0 breaks anonymous authentication: https://github.com/hierynomus/smbj/issues/792
152-
//noinspection GradleDependency
151+
// SMBJ 0.12.0 broke anonymous authentication: https://github.com/hierynomus/smbj/issues/792 ,
152+
// and it's still an issue in 0.14.0 according to
153+
// https://github.com/hierynomus/smbj/issues/792#issuecomment-2548018378 .
154+
//noinspection NewerVersionAvailable
153155
implementation ('com.hierynomus:smbj:0.11.5') {
154156
// org.bouncycastle:bcprov-jdk15on uses bytecode version unsupported by Jetifier, so use
155157
// org.bouncycastle:bcprov-jdk15to18 instead.
156158
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
157159
}
158-
def bouncy_castle_version = '1.81'
160+
def bouncy_castle_version = '1.83'
159161
implementation "org.bouncycastle:bcprov-jdk15to18:$bouncy_castle_version"
160162
implementation ('com.hierynomus:sshj:0.40.0') {
161163
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
@@ -170,14 +172,14 @@ dependencies {
170172
exclude group: 'com.hierynomus', module: 'smbj'
171173
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
172174
}
173-
implementation 'com.google.guava:guava:33.4.8-android'
175+
implementation 'com.google.guava:guava:33.5.0-android'
174176
// Guava conflicts with com.google.guava:listenablefuture:1.0 pulled in by AndroidX Core
175177
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
176178
implementation 'com.takisoft.preferencex:preferencex:1.1.0'
177-
implementation 'commons-net:commons-net:3.12.0'
179+
implementation 'commons-net:commons-net:3.13.0'
178180
// LicensesDialog 2.2.0 pulls in androidx.webkit and uses setForceDark() instead of correctly
179181
// setting colors.
180-
//noinspection GradleDependency
182+
//noinspection NewerVersionAvailable
181183
implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
182184
// dev.chrisbanesinsetter:insetter:0.6.0 makes inset unstable when entering immersive.
183185
implementation 'dev.chrisbanes:insetter-ktx:0.3.1'
@@ -211,7 +213,7 @@ dependencies {
211213
implementation 'org.slf4j:slf4j-android:1.7.36'
212214

213215
//#ifdef NONFREE
214-
implementation platform('com.google.firebase:firebase-bom:34.0.0')
216+
implementation platform('com.google.firebase:firebase-bom:34.11.0')
215217
implementation 'com.google.firebase:firebase-analytics'
216218
implementation 'com.google.firebase:firebase-crashlytics-ndk'
217219
//#endif

app/src/main/java/me/zhanghai/android/files/navigation/NavigationListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class NavigationListAdapter(
7070
itemShapeInsetStart, itemShapeInsetEnd, itemShapeInsetTop, itemShapeInsetBottom, context
7171
)
7272
val controlHighlightColor = context.getColorStateListByAttr(
73-
com.google.android.material.R.attr.colorControlHighlight
73+
androidx.appcompat.R.attr.colorControlHighlight
7474
)
7575
val itemForegroundMaskFillColor = ColorStateList.valueOf(Color.WHITE)
7676
val itemForegroundMask = createItemShapeDrawable(

0 commit comments

Comments
 (0)