Merge branch 'refs/heads/refactor' into Import-export-worker

# Conflicts: # gradle/libs.versions.toml
TeamNewPipe · Dec 17, 2024 · d3058fc · d3058fc
2 parents d6eaa4e + fbafdeb
commit d3058fc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -223,9 +223,6 @@ dependencies {
     implementation libs.androidx.room.rxjava3
     kapt libs.androidx.room.compiler
     implementation libs.androidx.swiperefreshlayout
-    // Newer version specified to prevent accessibility regressions with RecyclerView, see:
-    // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
-    implementation libs.androidx.viewpager2
     implementation libs.androidx.work.runtime
     implementation libs.androidx.work.rxjava3
     implementation libs.androidx.material

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -55,7 +55,6 @@ swiperefreshlayout = "1.1.0"
 teamnewpipe-filepicker = "5.0.0"
 teamnewpipe-nanojson = "1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 teamnewpipe-newpipe-extractor = "d3d5f2b3f03a5f2b479b9f6fdf1c2555cbb9de0e"
-viewpager2 = "1.1.0-beta02"
 work = "2.10.0"
 
 [plugins]
@@ -107,7 +106,6 @@ androidx-room-rxjava3 = { group = "androidx.room", name = "room-rxjava3", versio
 androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
 androidx-runner = { group = "androidx.test", name = "runner", version.ref = "runner" }
 androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swiperefreshlayout" }
-androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" }
 androidx-work-runtime = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
 androidx-work-rxjava3 = { group = "androidx.work", name = "work-rxjava3", version.ref = "work" }
 assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertjCore" }