Skip to content

Commit 7e378d7

Browse files
MattiasBuelensMattiasBuelens
authored
Merge pull request #75 from THEOplayer/release/1.13.0
Release 1.13.0
2 parents fe67834 + 77a481f commit 7e378d7

7 files changed

Lines changed: 53 additions & 38 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
> - 🏠 Internal
1010
> - 💅 Polish
1111
12+
## v1.13.0 (2025-09-12)
13+
14+
* 💥 The `minSdk` is now API 23 (Android 6.0 "Marshmallow"), to align with THEOplayer 10.0. ([#74](https://github.com/THEOplayer/android-ui/pull/74))
15+
* 💥 Open Video UI for Android is now compiled using the Kotlin 2 compiler. Update your app to use Kotlin Gradle Plugin 2.0.0 or newer. ([#74](https://github.com/THEOplayer/android-ui/pull/74))
16+
* 💥 Updated to Jetpack Compose version 1.9.0 ([BOM](https://developer.android.com/jetpack/compose/bom) 2025.08.01).
17+
* 🚀 Added support for THEOplayer 10.0. ([#74](https://github.com/THEOplayer/android-ui/pull/74))
18+
1219
## v1.12.0 (2025-09-08)
1320

1421
* 🚀 Added `PictureInPictureButton`. ([#19](https://github.com/THEOplayer/android-ui/issues/19), [#70](https://github.com/THEOplayer/android-ui/pull/70))
@@ -28,7 +35,7 @@
2835

2936
## v1.10.0 (2025-04-02)
3037

31-
* 🚀 Added support for THEOplayer 9.0. ([#61](https://github.com/THEOplayer/android-ui/pulls/61))
38+
* 🚀 Added support for THEOplayer 9.0. ([#61](https://github.com/THEOplayer/android-ui/pull/61))
3239

3340
## v1.9.4 (2024-12-18)
3441

@@ -61,7 +68,7 @@
6168

6269
## v1.8.0 (2024-09-06)
6370

64-
* 🚀 Added support for THEOplayer 8.0. ([#37](https://github.com/THEOplayer/android-ui/pulls/37))
71+
* 🚀 Added support for THEOplayer 8.0. ([#37](https://github.com/THEOplayer/android-ui/pull/37))
6572

6673
## v1.7.4 (2024-09-02)
6774

‎app/build.gradle.kts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
14
plugins {
25
alias(libs.plugins.android.application)
36
alias(libs.plugins.kotlin.android)
7+
alias(libs.plugins.compose.compiler)
48
}
59

610
android {
711
namespace = "com.theoplayer.android.ui.demo"
8-
compileSdk = 35
12+
compileSdk = libs.versions.android.compileSdk.get().toInt()
913

1014
defaultConfig {
1115
applicationId = "com.theoplayer.android.ui.demo"
12-
minSdk = 21
13-
targetSdk = 35
16+
minSdk = libs.versions.android.minSdk.get().toInt()
17+
targetSdk = libs.versions.android.targetSdk.get().toInt()
1418
versionCode = 1
1519
versionName = "1.0"
1620

@@ -38,15 +42,15 @@ android {
3842
sourceCompatibility = JavaVersion.VERSION_1_8
3943
targetCompatibility = JavaVersion.VERSION_1_8
4044
}
41-
kotlinOptions {
42-
jvmTarget = "1.8"
45+
kotlin {
46+
compilerOptions {
47+
apiVersion = KotlinVersion.KOTLIN_2_0
48+
jvmTarget = JvmTarget.JVM_1_8
49+
}
4350
}
4451
buildFeatures {
4552
compose = true
4653
}
47-
composeOptions {
48-
kotlinCompilerExtensionVersion = "1.5.15"
49-
}
5054
packaging {
5155
resources {
5256
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ plugins {
1414
alias(libs.plugins.android.application) apply false
1515
alias(libs.plugins.android.library) apply false
1616
alias(libs.plugins.kotlin.android) apply false
17+
alias(libs.plugins.compose.compiler) apply false
1718
alias(libs.plugins.dokka) apply false
1819
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ org.gradle.configuration-cache=true
2727
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
2828
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
2929
# The version of the THEOplayer Open Video UI for Android.
30-
version=1.12.0
30+
version=1.13.0

‎gradle/libs.versions.toml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
[versions]
2-
gradle = "8.7.3"
3-
kotlin-gradle-plugin = "1.9.25"
4-
ktx = "1.13.1"
5-
lifecycle-compose = "2.8.7"
6-
activity-compose = "1.9.3"
7-
appcompat = "1.7.0"
8-
compose-bom = "2024.11.00"
2+
android-minSdk = "23"
3+
android-compileSdk = "36"
4+
android-targetSdk = "36"
5+
gradle = "8.13.0"
6+
kotlin = "2.2.10"
7+
ktx = "1.17.0"
8+
lifecycle-compose = "2.9.3"
9+
activity-compose = "1.10.1"
10+
appcompat = "1.7.1"
11+
compose-bom = "2025.08.01"
912
junit4 = "4.13.2"
1013
playServices-castFramework = "21.5.0"
11-
ui-test-junit4 = "1.7.5" # ...not in BOM for some reason?
12-
androidx-junit = "1.2.1"
13-
androidx-espresso = "3.6.1"
14-
androidx-mediarouter = "1.7.0"
14+
ui-test-junit4 = "1.9.0" # ...not in BOM for some reason?
15+
androidx-junit = "1.3.0"
16+
androidx-espresso = "3.7.0"
17+
androidx-mediarouter = "1.8.1"
1518
dokka = "2.0.0"
16-
theoplayer = "9.2.0"
19+
theoplayer = { prefer="9.2.0", strictly = "[5.0, 11.0)" }
1720

1821
[libraries]
1922
androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
@@ -36,7 +39,7 @@ playServices-castFramework = { group = "com.google.android.gms", name = "play-se
3639
gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "gradle" }
3740
dokka-base = { group = "org.jetbrains.dokka", name = "dokka-base", version.ref = "dokka" }
3841
dokka-plugin = { group = "org.jetbrains.dokka", name = "android-documentation-plugin", version.ref = "dokka" }
39-
kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin-gradle-plugin" }
42+
kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
4043
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
4144
theoplayer = { group = "com.theoplayer.theoplayer-sdk-android", name = "core", version.ref = "theoplayer" }
4245
theoplayer-ads-ima = { group = "com.theoplayer.theoplayer-sdk-android", name = "integration-ads-ima", version.ref = "theoplayer" }
@@ -45,6 +48,7 @@ theoplayer-cast = { group = "com.theoplayer.theoplayer-sdk-android", name = "int
4548
[plugins]
4649
android-application = { id = "com.android.application", version.ref = "gradle" }
4750
android-library = { id = "com.android.library", version.ref = "gradle" }
48-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-gradle-plugin" }
51+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
52+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
4953
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
5054
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Nov 20 16:01:06 CET 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎ui/build.gradle.kts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
13
import java.time.Year
24
import kotlin.text.Typography.copyright
35

@@ -10,17 +12,18 @@ buildscript {
1012
plugins {
1113
alias(libs.plugins.android.library)
1214
alias(libs.plugins.kotlin.android)
15+
alias(libs.plugins.compose.compiler)
1316
alias(libs.plugins.dokka)
1417
alias(libs.plugins.dokka.javadoc)
1518
id("maven-publish")
1619
}
1720

1821
android {
1922
namespace = "com.theoplayer.android.ui"
20-
compileSdk = 35
23+
compileSdk = libs.versions.android.compileSdk.get().toInt()
2124

2225
defaultConfig {
23-
minSdk = 21
26+
minSdk = libs.versions.android.minSdk.get().toInt()
2427

2528
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2629
vectorDrawables {
@@ -41,15 +44,15 @@ android {
4144
sourceCompatibility = JavaVersion.VERSION_1_8
4245
targetCompatibility = JavaVersion.VERSION_1_8
4346
}
44-
kotlinOptions {
45-
jvmTarget = "1.8"
47+
kotlin {
48+
compilerOptions {
49+
apiVersion = KotlinVersion.KOTLIN_2_0
50+
jvmTarget = JvmTarget.JVM_1_8
51+
}
4652
}
4753
buildFeatures {
4854
compose = true
4955
}
50-
composeOptions {
51-
kotlinCompilerExtensionVersion = "1.5.15"
52-
}
5356
packaging {
5457
resources {
5558
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -82,11 +85,7 @@ dependencies {
8285
debugImplementation(libs.androidx.compose.ui.tooling)
8386
debugImplementation(libs.androidx.compose.ui.testManifest)
8487

85-
implementation(libs.theoplayer) {
86-
version {
87-
strictly("[5.0, 10.0)")
88-
}
89-
}
88+
implementation(libs.theoplayer)
9089

9190
dokkaPlugin(libs.dokka.plugin)
9291
}

0 commit comments

Comments
 (0)