Skip to content

Commit

Permalink
Merge pull request #27 from THEOplayer/maintenance/7.0_support
Browse files Browse the repository at this point in the history
Maintenance/7.0 support
  • Loading branch information
tvanlaerhoven authored Apr 16, 2024
2 parents 921160f + 2f55a7b commit 84d6608
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
> - 🏠 Internal
> - 💅 Polish
## Unreleased

* 🚀 Added support for THEOplayer Android SDK version 7.

## v1.5.0 (2024-02-21)

* 💥 Updated to Jetpack Compose version 1.6.1 ([BOM](https://developer.android.com/jetpack/compose/bom) 2024.02.00).
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
gradle = "8.2.2"
gradle = "8.3.2"
kotlin-gradle-plugin = "1.8.10"
ktx = "1.12.0"
lifecycle-runtime = "2.7.0"
activity-compose = "1.8.2"
appcompat = "1.6.1"
compose-bom = "2024.02.00"
compose-bom = "2024.04.00"
junit4 = "4.13.2"
ui-test-junit4 = "1.6.1" # ...not in BOM for some reason?
ui-test-junit4 = "1.6.5" # ...not in BOM for some reason?
androidx-junit = "1.1.5"
androidx-espresso = "3.5.1"
dokka = "1.8.10"
theoplayer = "6.10.0"
dokka = "1.9.20"
theoplayer = "7.1.1"

[libraries]
androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
Expand Down
5 changes: 3 additions & 2 deletions ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.jetbrains.dokka.base.DokkaBase
import org.jetbrains.dokka.base.DokkaBaseConfiguration
import org.jetbrains.dokka.gradle.DokkaTask
import java.time.Year
import kotlin.text.Typography.copyright

buildscript {
Expand Down Expand Up @@ -84,7 +85,7 @@ dependencies {

implementation(libs.theoplayer) {
version {
strictly("[5.0, 7.0[")
strictly("[5.0, 8.0)")
}
}

Expand Down Expand Up @@ -127,7 +128,7 @@ publishing {
tasks.withType<DokkaTask>().configureEach {
pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
customAssets = listOf(file("assets/logo-icon.svg"))
footerMessage = "$copyright 2023 THEO Technologies"
footerMessage = "$copyright ${Year.now().value} THEO Technologies"
}
}

Expand Down

0 comments on commit 84d6608

Please sign in to comment.