Skip to content

Commit 4a7fda9

Browse files
TacoTheDankStypox
authored andcommitted
Update miscellaneous libraries
1 parent ee3455e commit 4a7fda9

7 files changed

Lines changed: 20 additions & 25 deletions

File tree

app/build.gradle

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ ext {
118118

119119
leakCanaryVersion = '2.12'
120120
stethoVersion = '1.6.0'
121-
mockitoVersion = '4.0.0'
122121
}
123122

124123
configurations {
@@ -237,13 +236,10 @@ dependencies {
237236
kapt "frankiesardo:icepick-processor:${icepickVersion}"
238237

239238
// HTML parser
240-
implementation "org.jsoup:jsoup:1.16.1"
239+
implementation "org.jsoup:jsoup:1.16.2"
241240

242241
// HTTP client
243-
implementation "com.squareup.okhttp3:okhttp:4.11.0"
244-
// okhttp3:4.11.0 introduces a vulnerability from com.squareup.okio:okio@3.3.0,
245-
// remove com.squareup.okio:okio when updating okhttp
246-
implementation "com.squareup.okio:okio:3.4.0"
242+
implementation "com.squareup.okhttp3:okhttp:4.12.0"
247243

248244
// Media player
249245
implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
@@ -272,19 +268,19 @@ dependencies {
272268
implementation "io.noties.markwon:linkify:${markwonVersion}"
273269

274270
// Crash reporting
275-
implementation "ch.acra:acra-core:5.10.1"
271+
implementation "ch.acra:acra-core:5.11.3"
276272

277273
// Properly restarting
278274
implementation 'com.jakewharton:process-phoenix:2.1.2'
279275

280276
// Reactive extensions for Java VM
281-
implementation "io.reactivex.rxjava3:rxjava:3.1.6"
277+
implementation "io.reactivex.rxjava3:rxjava:3.1.8"
282278
implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
283279
// RxJava binding APIs for Android UI widgets
284280
implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
285281

286282
// Date and time formatting
287-
implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final"
283+
implementation "org.ocpsoft.prettytime:prettytime:5.0.7.Final"
288284

289285
/** Debugging **/
290286
// Memory leak detection
@@ -297,13 +293,12 @@ dependencies {
297293

298294
/** Testing **/
299295
testImplementation 'junit:junit:4.13.2'
300-
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
301-
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
296+
testImplementation 'org.mockito:mockito-core:5.6.0'
302297

303298
androidTestImplementation "androidx.test.ext:junit:1.1.5"
304299
androidTestImplementation "androidx.test:runner:1.5.2"
305300
androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
306-
androidTestImplementation "org.assertj:assertj-core:3.23.1"
301+
androidTestImplementation "org.assertj:assertj-core:3.24.2"
307302
}
308303

309304
static String getGitWorkingBranch() {

app/src/main/java/org/schabi/newpipe/database/Converters.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ object Converters {
4747

4848
@TypeConverter
4949
fun feedGroupIconOf(id: Int): FeedGroupIcon {
50-
return FeedGroupIcon.values().first { it.id == id }
50+
return FeedGroupIcon.entries.first { it.id == id }
5151
}
5252
}

app/src/main/java/org/schabi/newpipe/local/feed/service/FeedEventManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object FeedEventManager {
2626
}
2727

2828
sealed class Event {
29-
object IdleEvent : Event()
29+
data object IdleEvent : Event()
3030
data class ProgressEvent(val currentProgress: Int = -1, val maxProgress: Int = -1, @StringRes val progressMessage: Int = 0) : Event() {
3131
constructor(@StringRes progressMessage: Int) : this(-1, -1, progressMessage)
3232
}

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
5555
private var groupSortOrder: Long = -1
5656

5757
sealed class ScreenState : Serializable {
58-
object InitialScreen : ScreenState()
59-
object IconPickerScreen : ScreenState()
60-
object SubscriptionsPickerScreen : ScreenState()
61-
object DeleteScreen : ScreenState()
58+
data object InitialScreen : ScreenState()
59+
data object IconPickerScreen : ScreenState()
60+
data object SubscriptionsPickerScreen : ScreenState()
61+
data object DeleteScreen : ScreenState()
6262
}
6363

6464
@State @JvmField var selectedIcon: FeedGroupIcon? = null
@@ -370,7 +370,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
370370

371371
private fun setupIconPicker() {
372372
val groupAdapter = GroupieAdapter()
373-
groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) })
373+
groupAdapter.addAll(FeedGroupIcon.entries.map { PickerIconItem(it) })
374374

375375
feedGroupCreateBinding.iconSelector.apply {
376376
layoutManager = GridLayoutManager(requireContext(), 7, RecyclerView.VERTICAL, false)

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ class FeedGroupDialogViewModel(
110110
}
111111

112112
sealed class DialogEvent {
113-
object ProcessingEvent : DialogEvent()
114-
object SuccessEvent : DialogEvent()
113+
data object ProcessingEvent : DialogEvent()
114+
data object SuccessEvent : DialogEvent()
115115
}
116116

117117
data class Filter(val query: String, val showOnlyUngrouped: Boolean)

app/src/test/java/org/schabi/newpipe/local/subscription/FeedGroupIconTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class FeedGroupIconTest {
99
fun `No gaps and repeated ids`() {
1010
val usedIds = HashSet<Int>()
1111

12-
for ((shouldBeId, currentIcon) in FeedGroupIcon.values().withIndex()) {
12+
for ((shouldBeId, currentIcon) in FeedGroupIcon.entries.withIndex()) {
1313
val added = usedIds.add(currentIcon.id)
1414
assertTrue("Repeated ids (current item: ${currentIcon.name} - ${currentIcon.id})", added)
1515

@@ -24,7 +24,7 @@ class FeedGroupIconTest {
2424
fun `No icons pointing to the same attr`() {
2525
val usedIcons = HashSet<Int>()
2626

27-
for (groupIcon in FeedGroupIcon.values()) {
27+
for (groupIcon in FeedGroupIcon.entries) {
2828
val added = usedIcons.add(groupIcon.drawableResource)
2929
assertTrue("Repeated icon (current item: ${groupIcon.name} - ${groupIcon.id})", added)
3030
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.8.22'
4+
ext.kotlin_version = '1.9.10'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.1.1'
10+
classpath 'com.android.tools.build:gradle:8.1.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)