Skip to content

Add desugaring required by Google IMA SDK #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlegRyz merged 3 commits into from
Apr 21, 2026
Merged

Add desugaring required by Google IMA SDK #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
931faee
Remove theoplayer connector dependencies from common module
OlegRyz Apr 2, 2026
018f172
Add desugaring required by IMA library
OlegRyz Apr 2, 2026
c5aadc7
Add new line at the end of edited files
OlegRyz Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions advertising-optiview-ads/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ android {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true
}

}
Expand All @@ -45,6 +46,7 @@ kotlin {
}

dependencies {
coreLibraryDesugaring(libs.desugar.jdk.libs)
implementation(project(":common"))
implementation(libs.compose.runtime)
implementation(platform(libs.compose.bom))
Expand Down
24 changes: 24 additions & 0 deletions ...iview-ads/src/main/java/com/theoplayer/sample/ads/optiviewads/OptiviewAdsSourceManager.kt
View file
Open in desktop
Copy link
Copy Markdown

@adadukin-dolby adadukin-dolby Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a new line at the end of the file.
Can you, please, check other files as well as there are a few new files with missing new lines at the end of the file.

Copy link
Copy Markdown
Contributor Author

@OlegRyz OlegRyz Apr 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I added them to the files I edited

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.theoplayer.sample.ads.optiviewads

import com.theoplayer.android.api.ads.theoads.TheoAdDescription
import com.theoplayer.android.api.source.SourceDescription
import com.theoplayer.android.api.source.SourceType
import com.theoplayer.android.api.source.TypedSource

object OptiviewAdsSourceManager {
val THEOADS: SourceDescription by lazy {
SourceDescription.Builder(
TypedSource.Builder("https://example.com/manifest.m3u8")
.type(SourceType.HLS)
.hlsDateRange(true) // The flag needs to be set to `true` as the ad markers are done using `EXT-X-DATERANGE` tags.
.build()
).ads(
TheoAdDescription(
networkCode = "network-code-here",
customAssetKey = "asset-key-here",
Copy link
Copy Markdown

@adadukin-dolby adadukin-dolby Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to leave this as strings, or maybe leave unimplemented to fail the build?

Copy link
Copy Markdown
Contributor

@ceyhun-o ceyhun-o Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't want the build to fail. these values are placeholders to show how a THEOads stream can be set on the player.

backdropDoubleBox = "https://example.com/double.box.svg",
backdropLShape = "https://example.com/L-shape.svg"
)
).build()
}
}
2 changes: 1 addition & 1 deletion ...tising-optiview-ads/src/main/java/com/theoplayer/sample/ads/optiviewads/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class PlayerActivity : ComponentActivity() {

LaunchedEffect(player) {
// Configuring the player with a SourceDescription object.
theoPlayer.source = SourceManager.THEOADS
theoPlayer.source = OptiviewAdsSourceManager.THEOADS

// Set autoplay to start video whenever player is visible.
theoPlayer.isAutoplay = true
Expand Down
2 changes: 0 additions & 2 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,4 @@ dependencies {
implementation(libs.material3)
implementation(libs.ui)
api(libs.theoplayer)
api(libs.theoplayer.connector.theoads)
api(libs.theoplayer.connector.millicast)
}
34 changes: 3 additions & 31 deletions common/src/main/java/com/theoplayer/sample/common/SourceManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.theoplayer.sample.common

import com.theoplayer.android.api.ads.theoads.TheoAdDescription
import com.theoplayer.android.api.millicast.MillicastSource
import com.theoplayer.android.api.source.GoogleDaiTypedSource
import com.theoplayer.android.api.source.SourceDescription
import com.theoplayer.android.api.source.SourceType
Expand All @@ -18,8 +16,7 @@ import com.theoplayer.android.api.theolive.TheoLiveSource
import java.util.Collections


class SourceManager private constructor() {
companion object {
object SourceManager {
val BIP_BOP_HLS: SourceDescription by lazy {
SourceDescription
.Builder(
Expand Down Expand Up @@ -269,37 +266,12 @@ class SourceManager private constructor() {
.build()
).build()
}
val THEOADS: SourceDescription by lazy {
SourceDescription.Builder(
TypedSource.Builder("https://example.com/manifest.m3u8")
.type(SourceType.HLS)
.hlsDateRange(true) // The flag needs to be set to `true` as the ad markers are done using `EXT-X-DATERANGE` tags.
.build()
).ads(
TheoAdDescription(
networkCode = "network-code-here",
customAssetKey = "asset-key-here",
backdropDoubleBox = "https://example.com/double.box.svg",
backdropLShape = "https://example.com/L-shape.svg"
)
).build()
}

val THEOLIVE: SourceDescription by lazy {
SourceDescription.Builder(
TheoLiveSource(
src = "ar5c53uzm3si4h4zgkzrju44h",
)
).build()
}
val MILLICAST: SourceDescription by lazy {
SourceDescription.Builder(
MillicastSource(
src = "multiview",
streamAccountId = "k9Mwad",
apiUrl = "https://director.millicast.com/api/director/subscribe",
// subscriberToken = "<token>" // This is only required for subscribing to secure streams and should be omitted otherwise.
)
).build()
}
}
}
}
2 changes: 2 additions & 0 deletions google-dai/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ android {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true
}

}
Expand All @@ -45,6 +46,7 @@ kotlin {
}

dependencies {
coreLibraryDesugaring(libs.desugar.jdk.libs)
implementation(project(":common"))
implementation(libs.compose.runtime)
implementation(platform(libs.compose.bom))
Expand Down
2 changes: 2 additions & 0 deletions google-ima/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ android {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true
}

}
Expand All @@ -45,6 +46,7 @@ kotlin {
}

dependencies {
coreLibraryDesugaring(libs.desugar.jdk.libs)
implementation(project(":common"))
implementation(libs.compose.runtime)
implementation(platform(libs.compose.bom))
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[versions]
appcompat = "1.7.1"
constraintlayout = "2.2.1"
desugarJdkLibs = "2.1.5"
gson = "2.13.2"
media = "1.7.1"
recyclerview = "1.4.0"
Expand All @@ -26,6 +27,7 @@ serialization = "1.10.0"
[libraries]
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugarJdkLibs" }
gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "gradle" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
Expand Down
17 changes: 17 additions & 0 deletions ...llicast/src/main/java/com/theoplayer/sample/streaming/millicast/MillicastSourceManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.theoplayer.sample.streaming.millicast

import com.theoplayer.android.api.millicast.MillicastSource
import com.theoplayer.android.api.source.SourceDescription

object MillicastSourceManager {
val MILLICAST: SourceDescription by lazy {
SourceDescription.Builder(
MillicastSource(
src = "multiview",
streamAccountId = "k9Mwad",
apiUrl = "https://director.millicast.com/api/director/subscribe",
// subscriberToken = "<token>" // This is only required for subscribing to secure streams and should be omitted otherwise.
)
).build()
}
}
2 changes: 1 addition & 1 deletion ...aming-millicast/src/main/java/com/theoplayer/sample/streaming/millicast/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class PlayerActivity : ComponentActivity() {
theoplayerView.settings.setAllowBackgroundPlayback(true)

// Configuring the player with a SourceDescription object.
theoPlayer.source = SourceManager.MILLICAST
theoPlayer.source = MillicastSourceManager.MILLICAST

// Set autoplay to start video whenever player is visible.
theoPlayer.isAutoplay = true
Expand Down