From 6caa57e186f5123636e163f08e5d599ba0f5784f Mon Sep 17 00:00:00 2001 From: Mattias Buelens <649348+MattiasBuelens@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:13:57 +0100 Subject: [PATCH 1/2] Revert to compileSdk 34 (#56) Also revert to androidx.core:core-ktx 1.13.1 --- CHANGELOG.md | 4 ++++ app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- ui/build.gradle.kts | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63bcf5d..e055b33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ > - 🏠 Internal > - 💅 Polish +## Unreleased + +* 🐛 Revert to `compileSdk` 34. ([#56](https://github.com/THEOplayer/android-ui/pull/56/)) + ## v1.9.3 (2024-12-17) * 💥 Updated to Jetpack Compose version 1.7.5 ([BOM](https://developer.android.com/jetpack/compose/bom) 2024.11.00). diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e318dec..609ee34 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,12 +5,12 @@ plugins { android { namespace = "com.theoplayer.android.ui.demo" - compileSdk = 35 + compileSdk = 34 defaultConfig { applicationId = "com.theoplayer.android.ui.demo" minSdk = 21 - targetSdk = 35 + targetSdk = 34 versionCode = 1 versionName = "1.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65f177d..16f0f71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] gradle = "8.7.3" kotlin-gradle-plugin = "1.9.25" -ktx = "1.15.0" +ktx = "1.13.1" lifecycle-compose = "2.8.7" activity-compose = "1.9.3" appcompat = "1.7.0" diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index ad91e3d..5063c67 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -20,7 +20,7 @@ plugins { android { namespace = "com.theoplayer.android.ui" - compileSdk = 35 + compileSdk = 34 defaultConfig { minSdk = 21 From f3b74aaddaf3d5b0ff908794961081fa38144350 Mon Sep 17 00:00:00 2001 From: "theoplayer-bot[bot]" <873105+theoplayer-bot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:14:21 +0000 Subject: [PATCH 2/2] 1.9.4 --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e055b33..a5f532a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ > - 🏠 Internal > - 💅 Polish -## Unreleased +## v1.9.4 (2024-12-18) * 🐛 Revert to `compileSdk` 34. ([#56](https://github.com/THEOplayer/android-ui/pull/56/)) diff --git a/gradle.properties b/gradle.properties index 4498d87..65b3fc2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.nonTransitiveRClass=true android.nonFinalResIds=true org.gradle.configuration-cache=true # The version of the THEOplayer Open Video UI for Android. -version=1.9.3 +version=1.9.4