@24i/smartapps-bigscreen-rnv-build-engine 0.17.7 → 0.17.9

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

@@ -68,9 +68,9 @@ const buildAndroidTVProject = async (c) => {
         const cmd1 = `cd ${projectDir} && ${gradlew} --stacktrace ${taskAssembleName}`;
         const cmd2 = `cd ${projectDir} && ${gradlew} --stacktrace ${taskBundleName}`;
         console.log(`Running command: ${cmd1}`);
-        (0, child_process_1.execSync)(cmd1);
+        (0, child_process_1.execSync)(cmd1, { stdio: 'inherit' });
         console.log(`Running command: ${cmd2}`);
-        (0, child_process_1.execSync)(cmd2);
+        (0, child_process_1.execSync)(cmd2, { stdio: 'inherit' });
         fs.rmSync(tmpOutputDir, { recursive: true, force: true });
         fs.mkdirSync(tmpOutputDir);
         if (!fs.existsSync(outputDir)) {
@@ -254,7 +254,7 @@ const handleAndroidTVSdk = async (c) => {
     const installPath = `${os.homedir()}/Android`;
     const rnvSdkKey = 'ANDROID_SDK';
     const sdkName = 'android';
-    const sdksToInstall = '"build-tools;30.0.2" "emulator" "patcher;v4" "platform-tools" "platforms;android-30"';
+    const sdksToInstall = '"build-tools;33.0.2" "emulator" "patcher;v4" "platform-tools" "platforms;android-33"';
     rnv_1.Logger.logInfo(`Check ${sdkName} SDK at ${ANDROID_SDK}`);
     const isInstalledSDK = ANDROID_SDK ? fs.existsSync(ANDROID_SDK) : false;
     if (!isInstalledSDK) {

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

@@ -2,7 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    namespace = "com.twentyfouri.androidtv.amazoniap"
+    compileSdk = 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -10,8 +11,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk = 21
+        targetSdk = 33
 
         versionCode 1
         versionName "1.0"
@@ -31,7 +32,7 @@ android {
 dependencies {
     api fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation project(':common')
 }

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

@@ -6,7 +6,8 @@ def theoLicense = '{{THEO_LICENSE}}'
 def useTheoPlayer = theoLicense != ''
 
 android {
-    compileSdkVersion {{COMPILE_SDK_VERSION}}
+    namespace = 'com.twentyfouri.tvbridge'
+    compileSdk = {{COMPILE_SDK_VERSION}}
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -23,8 +24,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion {{MIN_SDK_VERSION}}
-        targetSdkVersion {{TARGET_SDK_VERSION}}
+        minSdk = {{MIN_SDK_VERSION}}
+        targetSdk = {{TARGET_SDK_VERSION}}
 
         applicationId 'com.twentyfouri.tvbridge'
         versionCode 1
@@ -82,25 +83,26 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
-    implementation "androidx.appcompat:appcompat:1.4.2"
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
-    implementation "com.google.dagger:dagger:2.42"
-    kapt "com.google.dagger:dagger-compiler:2.42"
+    implementation "com.google.dagger:dagger:2.48.1"
+    kapt "com.google.dagger:dagger-compiler:2.48.1"
 
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.5.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
     implementation "com.squareup.okhttp3:okhttp:4.9.2"
     if (useTheoPlayer) {
-        compileOnly "com.twentyfouri.player:exoplayer:0.6.0-alpha.36"
-        implementation "com.twentyfouri.player:theoplayer:0.6.0-alpha.36"
+        compileOnly "com.twentyfouri.player:exoplayer:0.7.0-alpha.3"
+        implementation "com.twentyfouri.player:theoplayer:0.7.0-alpha.3"
     } else {
-        implementation "com.twentyfouri.player:exoplayer:0.6.0-alpha.36"
-        compileOnly "com.twentyfouri.player:theoplayer:0.6.0-alpha.36"
+        implementation "com.twentyfouri.player:exoplayer:0.7.0-alpha.3"
+        compileOnly "com.twentyfouri.player:theoplayer:0.7.0-alpha.3"
     }
 
     implementation project(':common')

package/dist/templates/platforms/androidtv/project/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.twentyfouri.tvbridge" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Allow the app to run on non-touch devices. -->
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

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

@@ -261,16 +261,16 @@ class BridgeFromJavaScript(
      */
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_getCurrentAudioTrack(): String? = runBlocking("bridgeJavaScriptToAndroid_getCurrentAudioTrack") {
-        viewModel.audioTrack?.let { toJson(it) } ?: DISABLED_AUDIO_TRACK
-    }
+        viewModel.audioTrack?.let { toJson(it) }
+    } ?: DISABLED_AUDIO_TRACK
 
     /*
       Returns current AUDIO track to the player
      */
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_getCurrentSubtitleTrack(): String? = runBlocking("bridgeJavaScriptToAndroid_getCurrentSubtitleTrack") {
-        viewModel.subtitleTrack?.let { toJson(it) } ?: DISABLED_SUBTITLE_TRACK
-    }
+        viewModel.subtitleTrack?.let { toJson(it) }
+    } ?: DISABLED_SUBTITLE_TRACK
 
     /*
       Set the cookies to localstorage

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

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.8.22'
 
     repositories {
         google()
@@ -10,11 +10,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:10.0.0'
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
+        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
 
         // 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

@@ -2,7 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    namespace = "com.twentyfouri.tvbridge.common"
+    compileSdk = 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -10,8 +11,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk = 21
+        targetSdk = 33
 
         versionCode 1
         versionName "1.0"
@@ -31,6 +32,6 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }

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

@@ -2,7 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    namespace = "com.twentyfouri.tvbridge.googleiap"
+    compileSdk = 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -10,8 +11,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk = 21
+        targetSdk = 33
 
         versionCode 1
         versionName "1.0"
@@ -31,8 +32,8 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation project(':common')
     implementation 'com.android.billingclient:billing:3.0.1'
 }

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

@@ -1,6 +1,6 @@
 #Thu Jun 02 10:20:44 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

package/package.json

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

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twentyfouri.androidtv.amazoniap">
-
-</manifest>

package/dist/templates/platforms/androidtv/project/common/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twentyfouri.tvbridge.common">
-
-</manifest>

package/dist/templates/platforms/androidtv/project/googleiap/src/main/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twentyfouri.tvbridge.googleiap">
-
-    <uses-permission android:name="com.android.vending.BILLING" />
-
-</manifest>