@24i/smartapps-bigscreen-rnv-build-engine 0.18.2-alpha.2824 → 0.18.2-alpha.2828

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -133,7 +133,7 @@ const configureSigning = (c) => {
 };
 const configureProject = (c) => {
     rnv_1.Logger.logTask('configureProject');
-    const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app', buildGradleFileName);
+    const gradleModules = ['amazoniap', 'app', 'common', 'googleiap'];
     const version = semver.coerce(rnv_1.Common.getAppVersion(c, c.platform));
     const semVerObj = semver.parse(version);
     if (!semVerObj) {
@@ -141,7 +141,7 @@ const configureProject = (c) => {
     }
     const appId = rnv_1.Common.getConfigProp(c, c.platform, 'id', '');
     const minSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'minSdkVersion', 21);
-    const targetSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'targetSdkVersion', 34);
+    const targetSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'targetSdkVersion', 36);
     const compileSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'compileSdkVersion', 36);
     let versionCode = rnv_1.Common.getConfigProp(c, c.platform, 'versionCode');
     if (typeof versionCode === 'undefined') {
@@ -170,7 +170,10 @@ const configureProject = (c) => {
             override: appId,
         }];
     rnv_1.Common.addSystemInjects(c, injects);
-    rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
+    gradleModules.forEach((mod) => {
+        const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), mod, buildGradleFileName);
+        rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
+    });
 };
 const getHostedAppEntryUrl = (c) => {
     const { platform, runtime, program } = c;
@@ -220,7 +223,7 @@ const configureIap = (c) => {
     rnv_1.Logger.logTask('configureIap');
     const projectDir = rnv_1.Common.getPlatformProjectDir(c);
     const buildGradleFilePath = path.join(projectDir, 'app', buildGradleFileName);
-    const flavorFilePath = path.join(projectDir, `app/src/${flavourName}/java/com/twentyfouri/tvbridge/Flavor.kt`);
+    const flavorFilePath = path.join(projectDir, `app/src/${flavourName}/kotlin/com/twentyfouri/tvbridge/Flavor.kt`);
     const enableIap = rnv_1.Common.getConfigProp(c, c.platform, 'enableIap', false);
     let iapDependencies = [];
     let flavorImports = [];

package/dist/templates/platforms/androidtv/project/amazoniap/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
@@ -5,22 +7,19 @@ plugins {
 
 android {
     namespace = "com.twentyfouri.androidtv.amazoniap"
-    compileSdk = 36
+    compileSdk = {{COMPILE_SDK_VERSION}}
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = {{MIN_SDK_VERSION}}
+        targetSdk = {{TARGET_SDK_VERSION}}
 
-        versionCode 1
-        versionName "1.0"
+        versionCode {{APP_VERSION_CODE}}
+        versionName "{{APP_VERSION_NAME}}"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -34,7 +33,9 @@ android {
     }
 }
 
+kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17
+
 dependencies {
-    implementation 'com.amazon.device:amazon-appstore-sdk:3.0.7'
+    implementation 'com.amazon.device:amazon-appstore-sdk:3.0.8'
     implementation project(':common')
 }

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/kotlin/com/twentyfouri/bridgetv/amazoniap/AmazonIapService.kt

@@ -9,11 +9,11 @@ import com.amazon.device.iap.model.ProductDataResponse
 import com.amazon.device.iap.model.PurchaseResponse
 import com.amazon.device.iap.model.PurchaseUpdatesResponse
 import com.amazon.device.iap.model.UserDataResponse
-import com.twentyfouri.tvbridge.common.IapCallback
-import com.twentyfouri.tvbridge.common.IapException
-import com.twentyfouri.tvbridge.common.IapProduct
-import com.twentyfouri.tvbridge.common.IapPurchase
-import com.twentyfouri.tvbridge.common.IapService
+import com.twentyfouri.tvbridge.common.iap.IapCallback
+import com.twentyfouri.tvbridge.common.iap.IapException
+import com.twentyfouri.tvbridge.common.iap.IapProduct
+import com.twentyfouri.tvbridge.common.iap.IapPurchase
+import com.twentyfouri.tvbridge.common.iap.IapService
 import org.json.JSONObject
 
 class AmazonIapService(private val context: Context) : IapService, PurchasingListener {
@@ -61,7 +61,7 @@ class AmazonIapService(private val context: Context) : IapService, PurchasingLis
         }
     }
 
-    override fun getProducts(skus: List<String>) {
+    override fun getProducts(skus: Iterable<String>) {
         PurchasingService.getProductData(skus.toSet())
     }
 
@@ -86,7 +86,6 @@ class AmazonIapService(private val context: Context) : IapService, PurchasingLis
     }
 
     override fun acknowledgeReceipt(receipt: JSONObject) {
-        val receiptId = receipt.getString("receiptId")
-        PurchasingService.notifyFulfillment(receiptId, FulfillmentResult.FULFILLED)
+        PurchasingService.notifyFulfillment(receipt.getString("receiptId"), FulfillmentResult.FULFILLED)
     }
 }

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/kotlin/com/twentyfouri/bridgetv/amazoniap/AmazonIapServiceFactory.kt

@@ -2,7 +2,7 @@ package com.twentyfouri.bridgetv.amazoniap
 
 import android.content.Context
 import android.os.Build
-import com.twentyfouri.tvbridge.common.IapServiceFactory
+import com.twentyfouri.tvbridge.common.iap.IapServiceFactory
 import com.twentyfouri.tvbridge.common.installerPackageName
 
 object AmazonIapServiceFactory : IapServiceFactory {

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
@@ -10,7 +12,7 @@ def npawAccountCode = '{{NPAW_ACCOUNT_CODE}}'
 def useNpawPlugin = npawAccountCode != ''
 def useImaSdk = {{ENABLE_IMA_SDK}}
 
-def player_version = '0.8.0-alpha.28'
+def player_version = '0.8.0-alpha.35'
 
 android {
     namespace = 'com.twentyfouri.tvbridge'
@@ -21,10 +23,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '17'
-        freeCompilerArgs = ['-Xjvm-default=all-compatibility']
-    }
 
     packagingOptions {
         exclude 'META-INF/*.kotlin_module'
@@ -90,6 +88,11 @@ android {
     }
 }
 
+kotlin.compilerOptions {
+    jvmTarget = JvmTarget.JVM_17
+    freeCompilerArgs.add('-Xjvm-default=all-compatibility')
+}
+
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
@@ -99,16 +102,12 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
 
-    compileOnly "javax.annotation:jsr250-api:1.0"
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-common:2.9.2"
+    implementation "com.google.code.gson:gson:2.13.1"
 
-    implementation "com.google.dagger:dagger:2.56.2"
-    kapt "com.google.dagger:dagger-compiler:2.56.2"
+    implementation "com.google.dagger:dagger:2.57"
+    kapt "com.google.dagger:dagger-compiler:2.57"
 
-    implementation "com.squareup.retrofit2:retrofit:2.11.0"
-    implementation "com.squareup.retrofit2:converter-gson:2.11.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
-    implementation "com.squareup.okhttp3:okhttp:4.12.0"
     if (useBitmovin) {
         compileOnly "com.twentyfouri.player:exoplayer:$player_version"
         implementation "com.twentyfouri.player:bitmovin:$player_version"
@@ -117,14 +116,16 @@ dependencies {
         compileOnly "com.twentyfouri.player:bitmovin:$player_version"
     }
 
-    if (useNpawPlugin) {
-        implementation 'com.npaw.plugin:plugin:7.2.31'
-        implementation 'com.npaw.plugin:plugin-exoplayer:2.19.1-7.2.31'
-        implementation 'com.google.android.exoplayer:extension-okhttp:2.19.1'
+    def npaw = '7.3.7'
+    def exo = '2.19.1'
+    if (useNpawPlugin && !useBitmovin) {
+        implementation "com.npaw.plugin:plugin:$npaw"
+        implementation "com.npaw.plugin:plugin-exoplayer:$exo-$npaw"
+        implementation "com.google.android.exoplayer:extension-okhttp:$exo"
     } else {
-        compileOnly 'com.npaw.plugin:plugin:7.2.31'
-        compileOnly 'com.npaw.plugin:plugin-exoplayer:2.19.1-7.2.31'
-        compileOnly 'com.google.android.exoplayer:extension-okhttp:2.19.1'
+        compileOnly "com.npaw.plugin:plugin:$npaw"
+        compileOnly "com.npaw.plugin:plugin-exoplayer:$exo-$npaw"
+        compileOnly "com.google.android.exoplayer:extension-okhttp:$exo"
     }
 
     if (useImaSdk) {

package/dist/templates/platforms/androidtv/project/app/src/bigscreenAppstage/kotlin/com/twentyfouri/tvbridge/Flavor.kt

@@ -0,0 +1,9 @@
+package com.twentyfouri.tvbridge
+
+import com.twentyfouri.tvbridge.common.iap.IapServiceFactory
+
+{{FLAVOR_IMPORTS}}
+
+object Flavor : FlavorBase() {
+    override val iapServiceFactories = listOf<IapServiceFactory>({{FLAVOR_IAP_FACTORIES}})
+}

package/dist/templates/platforms/androidtv/project/app/src/main/kotlin/com/twentyfouri/tvbridge/FlavorBase.kt

@@ -0,0 +1,9 @@
+package com.twentyfouri.tvbridge
+
+import android.content.Context
+import com.twentyfouri.tvbridge.common.iap.IapServiceFactory
+
+abstract class FlavorBase {
+    open val iapServiceFactories = emptyList<IapServiceFactory>()
+    open fun signData(applicationContext: Context, dataJson: String) = ""
+}

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -401,6 +401,14 @@ class BridgeFromJavaScript(
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_GetOsLanguage() = viewModel.language
 
+    /*
+      Bridge Android 2 JS to reload the player
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_ReloadPlayer() {
+        viewModel.reloadPlayer()
+    }
+
     companion object {
         const val LOG_TAG = "JavaScriptBridge"
         val DISABLED_AUDIO_TRACK = JsonObject().apply {

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/global/di/ActivityComponent.kt

@@ -10,4 +10,4 @@ import javax.inject.Provider
 interface ActivityComponent : ApplicationComponent {
     val activity: Activity
     val viewModelFactory: Provider<WebViewModel>
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/global/di/ActivityModule.kt

@@ -11,4 +11,4 @@ class ActivityModule(
     @Provides
     fun provideActivity() =
             activity
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/global/di/ApplicationComponent.kt

@@ -2,15 +2,12 @@ package com.twentyfouri.tvbridge.global.di
 
 import android.content.Context
 import com.twentyfouri.player.base.PlayerFactoryBase
-import com.twentyfouri.tvbridge.common.IapService
+import com.twentyfouri.tvbridge.common.iap.IapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.BaseApplication
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
 import com.twentyfouri.tvbridge.sound.TouchPlayer
-import com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel
 import dagger.Component
-import dagger.internal.Factory
-import javax.inject.Provider
 import javax.inject.Singleton
 
 @Singleton
@@ -23,4 +20,4 @@ interface ApplicationComponent {
     val applicationContext: Context
     val touchPlayer: TouchPlayer
     val iapService: IapService
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/global/di/ApplicationModule.kt

@@ -3,7 +3,7 @@ package com.twentyfouri.tvbridge.global.di
 import android.content.Context
 import com.twentyfouri.player.base.PlayerFactoryBase
 import com.twentyfouri.tvbridge.Flavor
-import com.twentyfouri.tvbridge.common.NullIapService
+import com.twentyfouri.tvbridge.common.iap.NullIapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.BaseApplication
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
@@ -37,8 +37,8 @@ class ApplicationModule(
 
     @Singleton
     @Provides
-    fun provideIapService() = Flavor()
-            .getIapServiceFactories()
+    fun provideIapService() = Flavor
+            .iapServiceFactories
             .firstOrNull { it.detectSupport(baseApplication) }
             ?.build(baseApplication)
             ?: NullIapService()
@@ -48,4 +48,4 @@ class ApplicationModule(
     fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
         PlayerFactoryConfigured.buildFactory(config, baseApplication)
 
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/webview/view/Mainview.kt

@@ -14,4 +14,5 @@ interface Mainview {
     fun onBackPressed()
     fun launchIapPurchase(sku: String)
     fun hideKeyboard()
+    fun reloadPlayer()
 }

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/webview/view/WebViewActivity.kt

@@ -81,6 +81,10 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         initialized = true
     }
 
+    override fun reloadPlayer() {
+        binding.playerView.playerFactory = viewModel.playerFactory
+    }
+
     override fun hideKeyboard() {
         val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as? InputMethodManager
             ?: return

package/dist/templates/platforms/androidtv/project/app/src/main/{java → kotlin}/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -16,12 +16,50 @@ import android.webkit.WebView
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import com.twentyfouri.player.base.*
+import com.twentyfouri.player.base.AbrStrategy
+import com.twentyfouri.player.base.AdBreakEndedEvent
+import com.twentyfouri.player.base.AdBreakStartedEvent
+import com.twentyfouri.player.base.AdBreaksRescheduledEvent
+import com.twentyfouri.player.base.AdErrorEvent
+import com.twentyfouri.player.base.AdSkippedEvent
+import com.twentyfouri.player.base.AdStartedEvent
+import com.twentyfouri.player.base.AddAudioTrackEvent
+import com.twentyfouri.player.base.AddTextTrackEvent
+import com.twentyfouri.player.base.AudioTrack
+import com.twentyfouri.player.base.CanPlayEvent
+import com.twentyfouri.player.base.ChangeAudioTrackEvent
+import com.twentyfouri.player.base.ChangeTextTrackEvent
+import com.twentyfouri.player.base.EndedEvent
+import com.twentyfouri.player.base.ErrorEvent
+import com.twentyfouri.player.base.Event
+import com.twentyfouri.player.base.EventListener
+import com.twentyfouri.player.base.LoadedDataEvent
+import com.twentyfouri.player.base.LoadedMetadataEvent
+import com.twentyfouri.player.base.PauseEvent
+import com.twentyfouri.player.base.PlayerBase
+import com.twentyfouri.player.base.PlayerFactoryBase
+import com.twentyfouri.player.base.PlayingEvent
+import com.twentyfouri.player.base.RemoveAudioTrackEvent
+import com.twentyfouri.player.base.RemoveTextTrackEvent
+import com.twentyfouri.player.base.SeekedEvent
+import com.twentyfouri.player.base.SeekingEvent
+import com.twentyfouri.player.base.Source
+import com.twentyfouri.player.base.SourceDrmPlayready
+import com.twentyfouri.player.base.SourceDrmWidevine
+import com.twentyfouri.player.base.TextTrack
+import com.twentyfouri.player.base.TimeUpdateEvent
+import com.twentyfouri.player.base.TrackKind
+import com.twentyfouri.player.base.WaitingEvent
+import com.twentyfouri.player.base.buildUpon
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript
 import com.twentyfouri.tvbridge.bridge.BridgeToJavaScript
-import com.twentyfouri.tvbridge.common.*
+import com.twentyfouri.tvbridge.common.iap.IapCallback
+import com.twentyfouri.tvbridge.common.iap.IapException
+import com.twentyfouri.tvbridge.common.iap.IapProduct
+import com.twentyfouri.tvbridge.common.iap.IapPurchase
+import com.twentyfouri.tvbridge.common.iap.IapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
 import com.twentyfouri.tvbridge.global.utils.PlayerFactoryVersion
@@ -45,11 +83,11 @@ import javax.inject.Inject
  * Created by destivar on 15/02/16.
  */
 class WebViewModel @Inject constructor(
-        private val context: Context,
-        private val localStorage: LocalStorage,
-        private val config: BridgeConfig,
-        private val iapService: IapService,
-        val playerFactory: PlayerFactoryBase
+    private val context: Context,
+    private val localStorage: LocalStorage,
+    private val config: BridgeConfig,
+    private val iapService: IapService,
+    val playerFactory: PlayerFactoryBase
 ) : EventListener {
     var player: PlayerBase? = null
     private var view: Mainview? = null
@@ -238,6 +276,10 @@ class WebViewModel @Inject constructor(
         player.unload()
     }
 
+    fun reloadPlayer() {
+        view?.reloadPlayer()
+    }
+
     val currentPosition: Double
         get() = player?.currentTime ?: playerCache.savedPlayerPosition
     val duration: Double
@@ -468,7 +510,7 @@ class WebViewModel @Inject constructor(
     }
 
     fun signData(dataJson: String?): String? {
-        return if (dataJson == null || dataJson.isEmpty()) "" else Flavor().signData(context, dataJson)
+        return if (dataJson == null || dataJson.isEmpty()) "" else Flavor.signData(context, dataJson)
     }
 
     fun launchIapPurchase(sku: String?) {

package/dist/templates/platforms/androidtv/project/build.gradle

@@ -1,15 +1,15 @@
 buildscript {
-    ext.kotlin_version = '2.1.20'
+    ext.kotlin_version = '2.2.10'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.12.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.2'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
+        classpath 'com.google.gms:google-services:4.4.3'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.6'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

package/dist/templates/platforms/androidtv/project/common/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
@@ -5,22 +7,19 @@ plugins {
 
 android {
     namespace = "com.twentyfouri.tvbridge.common"
-    compileSdk = 36
+    compileSdk = {{COMPILE_SDK_VERSION}}
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = {{MIN_SDK_VERSION}}
+        targetSdk = {{TARGET_SDK_VERSION}}
 
-        versionCode 1
-        versionName "1.0"
+        versionCode {{APP_VERSION_CODE}}
+        versionName "{{APP_VERSION_NAME}}"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -34,7 +33,9 @@ android {
     }
 }
 
+kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17
+
 dependencies {
-    api 'androidx.core:core-ktx:1.16.0'
-    api 'androidx.appcompat:appcompat:1.7.0'
+    api 'androidx.core:core-ktx:1.17.0'
+    api 'androidx.appcompat:appcompat:1.7.1'
 }

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/Util.kt

@@ -0,0 +1,11 @@
+package com.twentyfouri.tvbridge.common
+
+import android.content.Context
+
+@Suppress("DEPRECATION", "unused")
+val Context.installerPackageName get() =
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+        packageManager.getInstallSourceInfo(packageName).installingPackageName
+    } else {
+        packageManager.getInstallerPackageName(packageName)
+    }

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapCallback.kt

@@ -0,0 +1,11 @@
+package com.twentyfouri.tvbridge.common.iap
+
+interface IapCallback {
+    fun checkNewPurchasesFinished(result: List<IapPurchase>)
+    fun checkNewPurchasesFinished(exception: Exception)
+    fun getProductsFinished(result: List<IapProduct>, missing: List<String>)
+    fun getProductsFinished(exception: Exception)
+    fun purchaseFinished(result: IapPurchase)
+    fun purchaseFinished(exception: Exception)
+    fun acknowledgeReceiptFinished(exception: Exception?)
+}

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapException.kt

@@ -0,0 +1,14 @@
+package com.twentyfouri.tvbridge.common.iap
+
+class IapException(
+    val status: String,
+    message: String = "In-app payment failed: $status",
+    cause: Exception? = null
+) : Exception(message, cause) {
+    companion object {
+        const val STATUS_FAILED = "FAILED"
+        const val STATUS_NOT_SUPPORTED = "NOT_SUPPORTED"
+        const val STATUS_INVALID_SKU = "INVALID_SKU"
+        const val STATUS_ALREADY_PURCHASED = "ALREADY_PURCHASED"
+    }
+}

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapProduct.kt

@@ -0,0 +1,16 @@
+package com.twentyfouri.tvbridge.common.iap
+
+data class IapProduct(
+    val title: String,
+    val description: String,
+    val price: String,
+    val icon: String,
+    val type: String,
+    val sku: String,
+) {
+    companion object {
+        const val TYPE_CONSUMABLE = "CONSUMABLE"
+        const val TYPE_SUBSCRIPTION = "SUBSCRIPTION"
+        const val TYPE_ENTITLED = "ENTITLED"
+    }
+}

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapPurchase.kt

@@ -0,0 +1,9 @@
+package com.twentyfouri.tvbridge.common.iap
+
+import org.json.JSONObject
+
+data class IapPurchase(
+    val sku: String,
+    val userId: String,
+    val receipt: JSONObject
+)

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapService.kt

@@ -0,0 +1,14 @@
+package com.twentyfouri.tvbridge.common.iap
+
+import android.app.Activity
+import org.json.JSONObject
+
+interface IapService {
+    fun initialize()
+    fun destroy()
+    fun checkNewPurchases()
+    fun getProducts(skus: Iterable<String>)
+    fun purchase(activity: Activity, sku: String)
+    fun acknowledgeReceipt(receipt: JSONObject)
+    fun setCallback(callback: IapCallback?)
+}

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/IapServiceFactory.kt

@@ -0,0 +1,8 @@
+package com.twentyfouri.tvbridge.common.iap
+
+import android.content.Context
+
+interface IapServiceFactory {
+    fun detectSupport(context: Context): Boolean
+    fun build(context: Context): IapService
+}

package/dist/templates/platforms/androidtv/project/common/src/main/kotlin/com/twentyfouri/tvbridge/common/iap/NullIapService.kt

@@ -0,0 +1,32 @@
+package com.twentyfouri.tvbridge.common.iap
+
+import android.app.Activity
+import org.json.JSONObject
+
+open class NullIapService : IapService {
+    private var callback: IapCallback? = null
+
+    override fun initialize() = Unit
+
+    override fun destroy() = Unit
+
+    override fun checkNewPurchases() {
+        callback?.checkNewPurchasesFinished(UnsupportedOperationException())
+    }
+
+    override fun getProducts(skus: Iterable<String>) {
+        callback?.getProductsFinished(UnsupportedOperationException())
+    }
+
+    override fun purchase(activity: Activity, sku: String) {
+        callback?.purchaseFinished(UnsupportedOperationException())
+    }
+
+    override fun acknowledgeReceipt(receipt: JSONObject) {
+        callback?.acknowledgeReceiptFinished(UnsupportedOperationException())
+    }
+
+    override fun setCallback(callback: IapCallback?) {
+        this.callback = callback
+    }
+}

package/dist/templates/platforms/androidtv/project/googleiap/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
@@ -5,22 +7,19 @@ plugins {
 
 android {
     namespace = "com.twentyfouri.tvbridge.googleiap"
-    compileSdk = 36
+    compileSdk = {{COMPILE_SDK_VERSION}}
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = {{MIN_SDK_VERSION}}
+        targetSdk = {{TARGET_SDK_VERSION}}
 
-        versionCode 1
-        versionName "1.0"
+        versionCode {{APP_VERSION_CODE}}
+        versionName "{{APP_VERSION_NAME}}"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -34,7 +33,9 @@ android {
     }
 }
 
+kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17
+
 dependencies {
     implementation project(':common')
-    implementation 'com.android.billingclient:billing-ktx:6.2.1'
+    implementation 'com.android.billingclient:billing-ktx:8.0.0'
 }

package/dist/templates/platforms/androidtv/project/googleiap/src/main/kotlin/com/twentyfouri/tvbridge/googleiap/GoogleIapService.kt

@@ -0,0 +1,6 @@
+package com.twentyfouri.tvbridge.googleiap
+
+import com.twentyfouri.tvbridge.common.iap.NullIapService
+
+// we'll implement this when the feature is confirmed
+object GoogleIapService : NullIapService()

package/dist/templates/platforms/androidtv/project/googleiap/src/main/kotlin/com/twentyfouri/tvbridge/googleiap/GoogleIapServiceFactory.kt

@@ -0,0 +1,13 @@
+package com.twentyfouri.tvbridge.googleiap
+
+import android.content.Context
+import android.os.Build
+import com.twentyfouri.tvbridge.common.iap.IapServiceFactory
+import com.twentyfouri.tvbridge.common.installerPackageName
+
+object GoogleIapServiceFactory : IapServiceFactory {
+    override fun detectSupport(context: Context) =
+        Build.MANUFACTURER != "Amazon" && context.installerPackageName != "com.amazon.venezia"
+
+    override fun build(context: Context) = GoogleIapService
+}

package/dist/templates/platforms/androidtv/project/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/dist/templates/platforms/androidtv/project/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.18.2-alpha.2824",
+	"version": "0.18.2-alpha.2828",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {

package/dist/templates/platforms/androidtv/project/app/src/bigscreenAppstage/java/com/twentyfouri/tvbridge/Flavor.kt

@@ -1,10 +0,0 @@
-package com.twentyfouri.tvbridge
-
-import com.twentyfouri.tvbridge.common.IapServiceFactory
-{{FLAVOR_IMPORTS}}
-
-class Flavor: FlavorBase() {
-    override fun getIapServiceFactories(): List<IapServiceFactory> {
-        return listOf({{FLAVOR_IAP_FACTORIES}})
-    }
-}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/FlavorBase.kt

@@ -1,12 +0,0 @@
-package com.twentyfouri.tvbridge
-
-import android.content.Context
-import com.twentyfouri.tvbridge.common.IapServiceFactory
-
-abstract class FlavorBase {
-
-    open fun signData(applicationContext: Context, dataJson: String) : String = ""
-
-    open fun getIapServiceFactories(): List<IapServiceFactory> =
-            emptyList()
-}

package/dist/templates/platforms/androidtv/project/common/src/main/java/com/twentyfouri/tvbridge/common/IapService.kt

@@ -1,115 +0,0 @@
-package com.twentyfouri.tvbridge.common
-
-import android.app.Activity
-import android.content.Context
-import org.json.JSONObject
-
-interface IapServiceFactory {
-    fun detectSupport(context: Context): Boolean
-    fun build(context: Context): IapService
-}
-
-@Suppress("DEPRECATION", "unused")
-val Context.installerPackageName: String?
-    get() = when {
-        android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R ->
-            packageManager.getInstallSourceInfo(packageName).installingPackageName
-        else ->
-            packageManager.getInstallerPackageName(packageName)
-    }
-
-interface IapService {
-    fun initialize()
-    fun destroy()
-    fun checkNewPurchases()
-    fun getProducts(skus: List<String>)
-    fun purchase(activity: Activity, sku: String)
-    fun acknowledgeReceipt(receipt: JSONObject)
-    fun setCallback(callback: IapCallback?)
-}
-
-interface IapCallback {
-    fun checkNewPurchasesFinished(result: List<IapPurchase>)
-    fun checkNewPurchasesFinished(exception: Exception)
-    fun getProductsFinished(result: List<IapProduct>, missing: List<String>)
-    fun getProductsFinished(exception: Exception)
-    fun purchaseFinished(result: IapPurchase)
-    fun purchaseFinished(exception: Exception)
-    fun acknowledgeReceiptFinished(exception: Exception?)
-}
-
-open class IapProduct(
-        val title: String,
-        val description: String,
-        val price: String,
-        val icon: String,
-        val type: String,
-        val sku: String,
-) {
-    companion object {
-        const val TYPE_CONSUMABLE = "CONSUMABLE"
-        const val TYPE_SUBSCRIPTION = "SUBSCRIPTION"
-        const val TYPE_ENTITLED = "ENTITLED"
-    }
-}
-
-open class IapPurchase(
-        val sku: String,
-        val userId: String,
-        val receipt: JSONObject
-)
-
-open class IapException(
-        val status: String,
-        message: String,
-        cause: Exception?
-): Exception(message, cause) {
-
-    constructor(
-            status: String
-    ) : this(status, "In-app payment failed: $status", null)
-
-    constructor(
-            status: String,
-            cause: Exception?
-    ) : this(status, cause?.message ?: "In-app payment failed: $status", cause)
-
-    companion object {
-        const val STATUS_FAILED = "FAILED"
-        const val STATUS_NOT_SUPPORTED = "NOT_SUPPORTED"
-        const val STATUS_INVALID_SKU = "INVALID_SKU"
-        const val STATUS_ALREADY_PURCHASED = "ALREADY_PURCHASED"
-    }
-}
-
-open class NullIapService : IapService {
-
-    protected var callback: IapCallback? = null
-        private set
-
-    override fun initialize() {
-    }
-
-    override fun destroy() {
-    }
-
-    override fun checkNewPurchases() {
-        callback?.checkNewPurchasesFinished(UnsupportedOperationException())
-    }
-
-    override fun getProducts(skus: List<String>) {
-        callback?.getProductsFinished(UnsupportedOperationException())
-    }
-
-    override fun purchase(activity: Activity, sku: String) {
-        callback?.purchaseFinished(UnsupportedOperationException())
-    }
-
-    override fun acknowledgeReceipt(receipt: JSONObject) {
-        callback?.acknowledgeReceiptFinished(UnsupportedOperationException())
-    }
-
-    override fun setCallback(callback: IapCallback?) {
-        this.callback = callback
-    }
-}

package/dist/templates/platforms/androidtv/project/googleiap/src/main/java/com/twentyfouri/tvbridge/googleiap/GoogleIapService.kt

@@ -1,29 +0,0 @@
-package com.twentyfouri.tvbridge.googleiap
-
-import android.content.Context
-import android.os.Build
-import com.twentyfouri.tvbridge.common.IapService
-import com.twentyfouri.tvbridge.common.IapServiceFactory
-import com.twentyfouri.tvbridge.common.NullIapService
-import com.twentyfouri.tvbridge.common.installerPackageName
-
-object GoogleIapServiceFactory : IapServiceFactory {
-    override fun detectSupport(context: Context): Boolean {
-        val installer = context.installerPackageName
-        return when {
-            installer == "com.android.vending" -> true
-            installer == "com.amazon.venezia" -> false
-            Build.MANUFACTURER == "Amazon" -> false
-            else -> true    // for non-Fire devices we assume that Google Play is installed
-        }
-    }
-
-    override fun build(context: Context): IapService =
-            GoogleIapService(context)
-}
-
-class GoogleIapService(
-        private val context: Context
-): NullIapService() {
-    // we'll implement this when the feature is confirmed
-}