Skip to content

Commit 0a0b5b4

Browse files
committed
libs: Update compose-related libraries to latest release
The about libraries gradle plugin does merge of duplicate by defaults. Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 parent 49354a3 commit 0a0b5b4

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ aboutLibraries {
220220
// note: offline mode prevents the plugin from fetching licenses at build time, which would be
221221
// harmful for reproducible builds
222222
offlineMode = true
223-
duplicationMode = DuplicateMode.MERGE
224223
}
225224

226225
dependencies {

app/src/main/java/org/schabi/newpipe/ui/components/about/Library.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ import com.mikepenz.aboutlibraries.entity.Library
2929
import com.mikepenz.aboutlibraries.entity.License
3030
import com.mikepenz.aboutlibraries.entity.Organization
3131
import com.mikepenz.aboutlibraries.entity.Scm
32-
import com.mikepenz.aboutlibraries.ui.compose.m3.util.author
33-
import kotlinx.collections.immutable.toImmutableList
34-
import kotlinx.collections.immutable.toImmutableSet
32+
import com.mikepenz.aboutlibraries.ui.compose.util.author
3533
import org.schabi.newpipe.ui.theme.AppTheme
3634
import org.schabi.newpipe.util.external_communication.ShareUtils
3735

@@ -140,7 +138,7 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
140138
name = "NewPipeExtractor",
141139
description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.",
142140
website = "https://newpipe.net",
143-
developers = listOf(Developer("TeamNewPipe", "https://newpipe.net")).toImmutableList(),
141+
developers = listOf(Developer("TeamNewPipe", "https://newpipe.net")),
144142
organization = Organization("TeamNewPipe", "https://newpipe.net"),
145143
scm = Scm(null, null, "https://github.com/TeamNewPipe/NewPipeExtractor"),
146144
licenses = setOf(
@@ -160,15 +158,15 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
160158
licenseContent = LoremIpsum().values.first(),
161159
hash = "4321"
162160
)
163-
).toImmutableSet()
161+
)
164162
),
165163
Library(
166164
uniqueId = "org.schabi.newpipe.extractor",
167165
artifactVersion = "v0.24.3",
168166
name = "NewPipeExtractor",
169167
description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.",
170168
website = null,
171-
developers = listOf<Developer>().toImmutableList(),
169+
developers = listOf<Developer>(),
172170
organization = null,
173171
scm = null,
174172
licenses = setOf(
@@ -180,7 +178,7 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
180178
licenseContent = LoremIpsum().values.first(),
181179
hash = "1234"
182180
)
183-
).toImmutableSet()
181+
)
184182
)
185183
)
186184
)

app/src/main/java/org/schabi/newpipe/ui/components/about/LibraryDefinitions.kt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import com.mikepenz.aboutlibraries.entity.Developer
1010
import com.mikepenz.aboutlibraries.entity.Library
1111
import com.mikepenz.aboutlibraries.entity.License
1212
import com.mikepenz.aboutlibraries.entity.Scm
13-
import kotlinx.collections.immutable.ImmutableSet
14-
import kotlinx.collections.immutable.toImmutableList
15-
import kotlinx.collections.immutable.toImmutableSet
1613
import org.schabi.newpipe.BuildConfig
1714
import org.schabi.newpipe.R
1815

@@ -38,7 +35,7 @@ fun getFirstPartyLibraries(
3835
licenseContent = null,
3936
hash = "GPL-3.0-or-later"
4037
)
41-
).toImmutableSet()
38+
)
4239

4340
val npeId = "com.github.TeamNewPipe:NewPipeExtractor"
4441
val npe = teamNewPipeLibraries.firstOrNull { it.uniqueId == npeId }
@@ -55,7 +52,7 @@ fun getFirstPartyLibraries(
5552
name = context.getString(R.string.team_newpipe),
5653
organisationUrl = context.getString(R.string.website_url)
5754
)
58-
).toImmutableList(),
55+
),
5956
organization = null,
6057
scm = Scm(null, null, context.getString(R.string.github_url)),
6158
licenses = gpl3
@@ -71,7 +68,7 @@ fun getFirstPartyLibraries(
7168
name = context.getString(R.string.team_newpipe),
7269
organisationUrl = context.getString(R.string.website_url)
7370
)
74-
).toImmutableList(),
71+
),
7572
organization = null,
7673
scm = Scm(null, null, context.getString(R.string.newpipe_extractor_github_url)),
7774
licenses = gpl3
@@ -82,7 +79,7 @@ fun getFirstPartyLibraries(
8279
fun getAdditionalThirdPartyLibraries(
8380
context: Context,
8481
teamNewPipeLibraries: List<Library>,
85-
licenses: ImmutableSet<License>
82+
licenses: Set<License>
8683
): List<Library> {
8784
val apache2 = licenses.firstOrNull { it.spdxId == "Apache-2.0" }
8885
val mit = licenses.firstOrNull { it.spdxId == "MIT" }
@@ -109,10 +106,10 @@ fun getAdditionalThirdPartyLibraries(
109106
name = context.getString(R.string.team_newpipe),
110107
organisationUrl = context.getString(R.string.website_url)
111108
)
112-
).toImmutableList(),
109+
),
113110
organization = null,
114111
scm = Scm(null, null, "https://github.com/TeamNewPipe/NoNonsense-FilePicker"),
115-
licenses = listOfNotNull(mpl2).toImmutableSet()
112+
licenses = setOfNotNull(mpl2)
116113
),
117114
Library(
118115
uniqueId = nanojsonId,
@@ -129,10 +126,10 @@ fun getAdditionalThirdPartyLibraries(
129126
name = context.getString(R.string.team_newpipe),
130127
organisationUrl = context.getString(R.string.website_url)
131128
)
132-
).toImmutableList(),
129+
),
133130
organization = null,
134131
scm = Scm(null, null, "https://github.com/TeamNewPipe/nanojson"),
135-
licenses = listOfNotNull(mit, apache2).toImmutableSet()
132+
licenses = setOfNotNull(mit, apache2)
136133
)
137134
)
138135
}

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
[versions]
7-
about-libraries = "11.2.3"
7+
about-libraries = "14.0.1"
88
acra = "5.13.1"
99
agp = "8.13.2"
1010
appcompat = "1.7.1"
@@ -15,7 +15,7 @@ bridge = "v2.0.2"
1515
cardview = "1.0.0"
1616
checkstyle = "13.4.0"
1717
coil = "3.4.0"
18-
compose-bom = "2024.10.01"
18+
compose-bom = "2026.03.01"
1919
constraintlayout = "2.2.1"
2020
core = "1.18.0"
2121
desugar = "2.1.5"
@@ -25,7 +25,7 @@ fragment-compose = "1.8.9"
2525
groupie = "2.10.1"
2626
hilt = "2.58" # Newer version requires AGP 9
2727
hilt-navigation-compose = "1.3.0"
28-
jsoup = "1.21.2"
28+
jsoup = "1.22.2"
2929
junit = "4.13.2"
3030
junit-ext = "1.3.0"
3131
kotlin = "2.3.20"
@@ -40,9 +40,9 @@ markwon = "4.6.2"
4040
material = "1.11.0" # TODO: update to newer version after bug is fixed. See https://github.com/TeamNewPipe/NewPipe/pull/13018
4141
media = "1.7.1"
4242
mockitoCore = "5.23.0"
43-
nav3Core = "1.0.1"
43+
nav3Core = "1.1.0"
4444
okhttp = "5.3.2"
45-
paging-compose = "3.3.2"
45+
paging-compose = "3.4.2"
4646
phoenix = "3.0.0"
4747
preference = "1.2.1"
4848
prettytime = "5.0.8.Final"

0 commit comments

Comments
 (0)