Skip to content

Commit 3cd3ba8

Browse files
Merge pull request #98 from THEOplayer/feature/update-dependencies
Update dependencies
2 parents b993ec7 + ced9bf0 commit 3cd3ba8

3 files changed

Lines changed: 34 additions & 26 deletions

File tree

build.gradle.kts

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ tasks.register("updateVersion") {
2626
val versionCatalog = rootProject.file("gradle/libs.versions.toml")
2727
inputs.file(versionCatalog)
2828

29-
val connectorVersion: String? by project.ext
3029
doLast {
30+
val connectorVersion = if (project.ext.has("connectorVersion")) {
31+
project.ext["connectorVersion"] as String?
32+
} else null
3133
require(!connectorVersion.isNullOrBlank()) { "Missing connectorVersion" }
34+
3235
ant.withGroovyBuilder {
3336
"replaceregexp"(
3437
"file" to versionCatalog,
@@ -44,16 +47,20 @@ tasks.register("updatePlayerVersion") {
4447
val versionCatalog = rootProject.file("gradle/libs.versions.toml")
4548
inputs.file(versionCatalog)
4649

47-
val sdkVersion: String? by project.ext
48-
require(!sdkVersion.isNullOrBlank()) { "Missing sdkVersion" }
50+
doLast {
51+
val sdkVersion = if (project.ext.has("sdkVersion")) {
52+
project.ext["sdkVersion"] as String?
53+
} else null
54+
require(!sdkVersion.isNullOrBlank()) { "Missing sdkVersion" }
4955

50-
ant.withGroovyBuilder {
51-
"replaceregexp"(
52-
"file" to versionCatalog,
53-
"match" to """^theoplayer = \{(.*) prefer = ".+" (.*)\}$""",
54-
"replace" to """theoplayer = {\1 prefer = "$sdkVersion" \2}""",
55-
"byline" to true
56-
)
56+
ant.withGroovyBuilder {
57+
"replaceregexp"(
58+
"file" to versionCatalog,
59+
"match" to """^theoplayer = \{(.*) prefer = ".+" (.*)\}$""",
60+
"replace" to """theoplayer = {\1 prefer = "$sdkVersion" \2}""",
61+
"byline" to true
62+
)
63+
}
5764
}
5865
}
5966

gradle/libs.versions.toml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
[versions]
22
androidConnector = "11.1.0"
3-
androidGradlePlugin = "9.1.0"
4-
androidTools = "32.1.0"
3+
androidGradlePlugin = "9.2.1"
4+
androidTools = "32.2.1"
55
androidToolsDesugarJdkLibs = "2.1.5"
6-
kotlin = "2.2.10"
7-
kotlinxSerialization = "2.2.10"
8-
kotlinxSerializationJson = "1.9.0"
6+
kotlin = "2.4.0"
7+
kotlinxSerialization = "2.4.0"
8+
kotlinxSerializationJson = "1.11.0"
99
dokka = "2.2.0"
1010
androidxAppCompat = "1.7.1"
11-
androidxActivity = "1.10.1"
12-
androidxCore = "1.17.0"
13-
androidxComposeBom = "2025.08.01"
11+
androidxActivity = "1.13.0"
12+
# NOTE: upgrading beyond 1.18.0 requires compileSdk 37
13+
androidxCore = "1.18.0"
14+
androidxComposeBom = "2026.06.00"
1415
# NOTE: upgrading beyond 2.5.1 requires targetSdk 33
1516
androidxLifecycle = "2.5.1"
16-
androidxMedia = "1.7.1"
17-
kotlinxCoroutines = "1.10.2"
17+
androidxMedia = "1.8.0"
18+
kotlinxCoroutines = "1.11.0"
1819
theoplayer = { strictly = "[11.0.0, 12.0.0)", prefer = "11.5.0" }
1920
# Minimum supported THEOplayer version.
2021
# Must match the lower version bound of the "theoplayer" version above.
2122
theoplayerMin = "11.0.0"
22-
theoplayerAndroidUi = "1.13.0"
23+
theoplayerAndroidUi = "1.14.1"
2324
junit = "4.13.2"
24-
kotlinTestJunit = "2.2.10"
25+
kotlinTestJunit = "2.3.21"
2526
mockito = "4.11.0"
2627
mockitoKotlin = "4.1.0"
27-
androidxEspresso = "3.6.1"
28+
androidxEspresso = "3.7.0"
2829
androidxTestCore = "1.7.0"
2930
androidxTestExt = "1.3.0"
3031
robolectric = "4.16.1"
31-
conviva = "4.0.43"
32+
conviva = "4.0.51"
3233
nielsen = "9.2.0.0"
33-
comscore = "6.10.0"
34+
comscore = "6.14.0"
3435
yospace = { strictly = "[3.10.0, 4.0)", prefer = "3.11.2" }
3536

3637
[libraries]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Sep 06 12:39:24 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)