Skip to content

Commit fb6572b

Browse files
MattiasBuelensMattiasBuelens
authored
Merge pull request #91 from THEOplayer/release/1.13.3
Release 1.13.3
2 parents 34cdd86 + 11a9ab7 commit fb6572b

17 files changed

Lines changed: 328 additions & 120 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
- name: Setup Java
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: temurin
2424
java-version: 17
25-
- name: Validate Gradle wrapper
26-
uses: gradle/actions/wrapper-validation@v3
2725
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@v3
26+
uses: gradle/actions/setup-gradle@v5
27+
with:
28+
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
29+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
30+
- name: Run tests
31+
run: ./gradlew test --configuration-cache
2932
- name: Assemble
30-
run: ./gradlew assembleRelease
33+
run: ./gradlew assembleRelease --configuration-cache

‎.github/workflows/create-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919
steps:
2020
- name: Create app token
21-
uses: actions/create-github-app-token@v1
21+
uses: actions/create-github-app-token@v3
2222
id: app-token
2323
with:
2424
app-id: ${{ vars.THEOPLAYER_BOT_APP_ID }}
2525
private-key: ${{ secrets.THEOPLAYER_BOT_PRIVATE_KEY }}
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828
with:
2929
token: ${{ steps.app-token.outputs.token }}
3030
- name: Configure Git user

‎.github/workflows/docs.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,28 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929
- name: Setup Pages
30-
uses: actions/configure-pages@v4
30+
uses: actions/configure-pages@v5
3131
- name: Setup Java
32-
uses: actions/setup-java@v4
32+
uses: actions/setup-java@v5
3333
with:
3434
distribution: temurin
3535
java-version: 17
36-
- name: Validate Gradle wrapper
37-
uses: gradle/actions/wrapper-validation@v3
3836
- name: Setup Gradle
39-
uses: gradle/actions/setup-gradle@v3
37+
uses: gradle/actions/setup-gradle@v5
38+
with:
39+
cache-read-only: true
40+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4041
- name: Build API documentation with Dokka
41-
run: ./gradlew ui:dokkaGeneratePublicationHtml
42+
run: ./gradlew ui:dokkaGeneratePublicationHtml --configuration-cache
4243
- name: Build with Jekyll
4344
uses: actions/jekyll-build-pages@v1
4445
with:
4546
source: ./site
4647
destination: ./_site
4748
- name: Upload artifact
48-
uses: actions/upload-pages-artifact@v3
49+
uses: actions/upload-pages-artifact@v4
4950

5051
# Deployment job
5152
deploy:

‎.github/workflows/publish.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,31 @@ jobs:
2121
id-token: write
2222
steps:
2323
- name: Create app token
24-
uses: actions/create-github-app-token@v1
24+
uses: actions/create-github-app-token@v3
2525
id: app-token
2626
with:
2727
app-id: ${{ vars.THEOPLAYER_BOT_APP_ID }}
2828
private-key: ${{ secrets.THEOPLAYER_BOT_PRIVATE_KEY }}
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
token: ${{ steps.app-token.outputs.token }}
3333
- name: Configure Git user
3434
run: |
3535
git config user.name 'theoplayer-bot[bot]'
3636
git config user.email '873105+theoplayer-bot[bot]@users.noreply.github.com'
3737
- name: Setup Java
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with:
4040
distribution: temurin
4141
java-version: 17
42-
- name: Validate Gradle wrapper
43-
uses: gradle/actions/wrapper-validation@v3
4442
- name: Setup Gradle
45-
uses: gradle/actions/setup-gradle@v3
43+
uses: gradle/actions/setup-gradle@v5
44+
with:
45+
cache-read-only: true
46+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4647
- name: Publish package
47-
run: ./gradlew publish
48+
run: ./gradlew publish --configuration-cache
4849
env:
4950
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5051
REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }}

‎.github/workflows/sync-develop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Create app token
12-
uses: actions/create-github-app-token@v1
12+
uses: actions/create-github-app-token@v3
1313
id: app-token
1414
with:
1515
app-id: ${{ vars.THEOPLAYER_BOT_APP_ID }}
1616
private-key: ${{ secrets.THEOPLAYER_BOT_PRIVATE_KEY }}
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
token: ${{ steps.app-token.outputs.token }}
2121
ref: develop

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
> - 🏠 Internal
1010
> - 💅 Polish
1111
12+
## v1.13.3 (2026-03-23)
13+
14+
* 🐛 Changed the minimum supported THEOplayer version to 7.6.0. ([#85](https://github.com/THEOplayer/android-ui/pull/85))
15+
* This was effectively already the minimum version as of Open Video UI for Android version 1.7.2, but it wasn't noticed until now.
16+
* Future versions will be properly tested with the minimum supported THEOplayer version to avoid similar compatibility issues.
17+
* 🐛 `Player.pictureInPicture` now also checks whether the `Activity` itself is in picture-in-picture mode, in case the activity has custom picture-in-picture logic (that does not use THEOplayer's `PiPManager` API). ([#89](https://github.com/THEOplayer/android-ui/pull/89/))
18+
1219
## v1.13.2 (2026-03-03)
1320

1421
* 🐛 Fixed `PictureInPictureButton` to only be shown when the backing `THEOplayerView` has a valid `PiPConfiguration`. ([#81](https://github.com/THEOplayer/android-ui/pull/81))

‎app/build.gradle.kts‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ android {
3838
matchingFallbacks += listOf("debug")
3939
}
4040
}
41+
42+
flavorDimensions += "player"
43+
productFlavors {
44+
create("latestPlayer") {
45+
// Use the latest supported THEOplayer version
46+
dimension = "player"
47+
}
48+
create("minPlayer") {
49+
// Use the minimum supported THEOplayer version
50+
dimension = "player"
51+
}
52+
}
53+
4154
compileOptions {
4255
sourceCompatibility = JavaVersion.VERSION_1_8
4356
targetCompatibility = JavaVersion.VERSION_1_8
@@ -59,12 +72,18 @@ android {
5972
}
6073

6174
dependencies {
75+
val mavenImplementation = configurations.getByName("mavenImplementation")
76+
val latestPlayerImplementation = configurations.getByName("latestPlayerImplementation")
77+
val minPlayerImplementation = configurations.getByName("minPlayerImplementation")
78+
6279
implementation(platform(libs.androidx.compose.bom))
6380

6481
implementation(libs.androidx.ktx)
6582
implementation(libs.androidx.lifecycle.compose)
6683
implementation(libs.androidx.activity.compose)
6784
implementation(libs.androidx.appcompat)
85+
implementation(libs.androidx.core)
86+
implementation(libs.androidx.core.pip)
6887
implementation(libs.androidx.compose.ui.ui)
6988
implementation(libs.androidx.compose.ui.toolingPreview)
7089
implementation(libs.androidx.compose.material3)
@@ -80,9 +99,13 @@ dependencies {
8099

81100
debugImplementation(project(":ui"))
82101
releaseImplementation(project(":ui"))
83-
"mavenImplementation"("com.theoplayer.android-ui:android-ui:1.+")
102+
mavenImplementation("com.theoplayer.android-ui:android-ui:1.+")
84103

85-
implementation(libs.theoplayer)
86-
implementation(libs.theoplayer.ads.ima)
87-
implementation(libs.theoplayer.cast)
88-
}
104+
latestPlayerImplementation(libs.theoplayer)
105+
latestPlayerImplementation(libs.theoplayer.ads.ima)
106+
latestPlayerImplementation(libs.theoplayer.cast)
107+
108+
minPlayerImplementation(libs.theoplayer.min)
109+
minPlayerImplementation(libs.theoplayer.min.ads.ima)
110+
minPlayerImplementation(libs.theoplayer.min.cast)
111+
}

0 commit comments

Comments
 (0)