@24i/smartapps-bigscreen-rnv-build-engine 0.17.2-alpha.2160 → 0.17.2-alpha.2162

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

@@ -23,35 +23,64 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAndroidTVSdk = exports.configureAndroidTVProject = void 0;
+exports.handleAndroidTVSdk = exports.configureAndroidTVProject = exports.buildAndroidTVProject = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
+const semver = __importStar(require("semver"));
 const child_process_1 = require("child_process");
 const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
 const services_1 = require("../sdk-utils/sdk-installer/services");
 const constants_1 = require("../../constants");
+const buildAndroidTVProject = async (c) => {
+    rnv_1.Logger.logTask('buildAndroidTVProject');
+    await (0, sdk_webpack_2.buildCoreWebpackProject)(c);
+    if (!c.program.hosted) {
+        const projectDir = rnv_1.Common.getPlatformProjectDir(c);
+        const projectParentDir = path.join(projectDir, '..');
+        const tOut = path.join(projectParentDir, 'output');
+        const flavourName = 'bigscreenAppstage';
+        const apkFileName = `app-${flavourName}-debug.apk`;
+        const apkFilePath = path.join(projectDir, `app/build/outputs/apk/${flavourName}/debug/${apkFileName}`);
+        const gradlew = './gradlew';
+        (0, child_process_1.execSync)(`cd ${projectDir} && ${gradlew} assembleBigscreenAppstageDebug`);
+        if (!fs.existsSync(tOut)) {
+            fs.mkdirSync(tOut);
+        }
+        const outputFilePath = path.join(tOut, apkFileName);
+        fs.copyFileSync(apkFilePath, outputFilePath);
+        rnv_1.Logger.logSuccess(`Your APK package is located in ${rnv_1.Logger.chalk().cyan(tOut)} .`);
+    }
+};
+exports.buildAndroidTVProject = buildAndroidTVProject;
 const configureProject = (c) => {
     rnv_1.Logger.logTask('configureProject');
-    const configFile = 'appinfo.json';
-    const configFileSource = path.join(rnv_1.Common.getTemplateProjectDir(c), configFile);
-    const configFileDest = path.join(rnv_1.Common.getPlatformProjectDir(c), configFile);
-    rnv_1.FileUtils.writeCleanFile(configFileSource, configFileDest, [], null, c);
-    let fileContent = fs.readFileSync(configFileDest).toString();
-    fileContent = fileContent.replace(/"true"/g, 'true');
-    fileContent = fileContent.replace(/"false"/g, 'false');
-    fs.writeFileSync(configFileDest, fileContent);
-    return true;
+    const buildGradleFileName = 'build.gradle';
+    const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app', buildGradleFileName);
+    const p = c.buildConfig.platforms[c.platform] || {};
+    const versionName = semver.coerce(rnv_1.Common.getAppVersion(c, c.platform));
+    const versionCode = 123;
+    const injects = [{
+            pattern: '{{APP_VERSION_CODE}}',
+            override: versionCode,
+        }, {
+            pattern: '{{APP_VERSION_NAME}}',
+            override: versionName,
+        }];
+    rnv_1.Common.addSystemInjects(c, injects);
+    rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
 };
 const configureAndroidTVProject = async (c) => {
-    rnv_1.Logger.logTask('configureAndroidTVProjectX');
+    rnv_1.Logger.logTask('configureAndroidTVProject');
     c.runtime.platformBuildsProjectPath = rnv_1.Common.getPlatformProjectDir(c);
     const platform = constants_1.Platforms.ANDROIDTV;
     await rnv_1.ProjectManager.copyAssetsFolder(c, platform);
     await (0, sdk_webpack_1.configureCoreWebProject)(c);
     await configureAndroidProperties(c);
+    configureProject(c);
     const gradlew = path.join(rnv_1.Common.getPlatformProjectDir(c), 'gradlew');
     fs.chmodSync(gradlew, '755');
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);
@@ -89,10 +118,12 @@ const handleAndroidTVSdk = async (c) => {
     const rnvSdkKey = 'ANDROID_SDK';
     const sdkName = 'android';
     const sdksToInstall = '"build-tools;30.0.2" "emulator" "patcher;v4" "platform-tools" "platforms;android-30"';
+    rnv_1.Logger.logInfo(`Check ${sdkName} SDK at ${ANDROID_SDK}`);
     const isInstalledSDK = ANDROID_SDK ? fs.existsSync(ANDROID_SDK) : false;
     if (!isInstalledSDK) {
         if (fs.existsSync(installPath)) {
             await (0, sdk_utils_1.registerSdkPath)(c, rnvSdkKey, installPath);
+            rnv_1.Logger.logInfo(`Used ${sdkName} SDK at ${c.buildConfig?.sdks?.ANDROID_SDK}`);
         }
         else {
             const parsedZipPath = path.parse(ANDROID_SDK_INSTALLER_URL);
@@ -111,7 +142,12 @@ const handleAndroidTVSdk = async (c) => {
             (0, child_process_1.execSync)(`yes | ${installPath}/cmdline-tools/latest/bin/sdkmanager --licenses`);
             rnv_1.Logger.logDebug(`Installing SDKs ${sdksToInstall}`);
             (0, child_process_1.execSync)(`${installPath}/cmdline-tools/latest/bin/sdkmanager ${sdksToInstall}`);
+            rnv_1.Logger.logSuccess(`SDK successfully installed at: ${installPath}`);
+            await (0, sdk_utils_1.registerSdkPath)(c, rnvSdkKey, installPath);
         }
     }
+    else {
+        rnv_1.Logger.logInfo(`Used ${sdkName} SDK at ${c.buildConfig?.sdks?.ANDROID_SDK}`);
+    }
 };
 exports.handleAndroidTVSdk = handleAndroidTVSdk;

package/dist/src/tasks/task.rnv.build.js

@@ -62,7 +62,6 @@ const buildFn = async (c, parentTask, originTask) => {
     await (0, sdks_1.handlePlatformSdk)(c);
     await rnv_1.TaskManager.executeOrSkipTask(c, TASK_PACKAGE, TASK_BUILD, originTask);
     switch (platform) {
-        case constants_1.Platforms.ANDROIDTV:
         case constants_1.Platforms.ENTONE:
         case constants_1.Platforms.HBBTV:
         case constants_1.Platforms.KREATV:
@@ -83,6 +82,9 @@ const buildFn = async (c, parentTask, originTask) => {
             await sdks_1.SDKWebos.buildWebOSProject(c);
             renameOutput(c);
             break;
+        case constants_1.Platforms.ANDROIDTV:
+            await sdks_1.SDKAndroidtv.buildAndroidTVProject(c);
+            break;
         default:
             rnv_1.PlatformManager.logErrorPlatform(c);
     }

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

@@ -70,233 +70,22 @@ android {
 
     flavorDimensions "bridge"
     productFlavors {
-        portal {
-            dimension "bridge"
-            versionCode 2003000
-            versionName "2.3"
-            resValue "string", "app_name", "24i Portal"
-        }
-        portalDrm {
-            dimension "bridge"
-            applicationIdSuffix ".drmCallback"
-            versionCode 1006000
-            versionName "1.6"
-            resValue "string", "app_name", "24i Portal DRM"
-        }
-        smartOTT {
-            dimension "bridge"
-            applicationIdSuffix ".smartOTT"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "SmartOTT"
-        }
-        hummingbird {
-            dimension "bridge"
-            applicationIdSuffix ".hummingbird"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "Hummingbird"
-        }
-        tennisChannel {
-            dimension "bridge"
-            applicationId "com.tennischannel.tceverywhere.amazon"
-            versionCode 46
-            versionName "1.1.1"
-            resValue "string", "app_name", "Tennis Channel Sinclair"
-        }
-        cineClick {
-            dimension "bridge"
-            applicationIdSuffix ".cineclick"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "Cineclick"
-        }
-        hereMedia {
-            dimension "bridge"
-            applicationIdSuffix ".heretv"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "Here TV"
-        }
-        fuboTV {
-            dimension "bridge"
-            applicationIdSuffix ".fuboTV"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "[Fubo TV]"
-        }
-        sentai {
-            dimension "bridge"
-            applicationIdSuffix ".sentai"
-            versionCode 1007002
-            versionName "1.7.2"
-            resValue "string", "app_name", "HIDIVE"
-            // uncomment for signing testing builds
-//            signingConfig signingConfigs.hidiverelease
-        }
-        sentaiandroidtv {
-            dimension "bridge"
-            applicationId 'com.twentyfouri.androidtv.hidive'
-            versionCode 1010000
-            versionName "1.1.0"
-            resValue "string", "app_name", "HIDIVE"
-            // uncomment for signing testing builds
-//            signingConfig signingConfigs.hidiverelease
-        }
-        newsmax {
-            dimension "bridge"
-            //Android TV
-            applicationId "com.fli.android.newsmaxapp"
-            versionCode 1000300
-            versionName "1.0.2-androidTV"
-            resValue "string", "app_name", "Newsmax"
-            //FireTV
-//            applicationId "com.fli.googletv.newsmaxapp"
-  //          versionCode 1411285562
-  //          versionName "1.0.5-fireTV"
-   //         resValue "string", "app_name", "Newsmax"
-        }
-        entel {
-            dimension "bridge"
-            applicationIdSuffix ".entel"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "Entel"
-        }
-        youFone {
-            dimension "bridge"
-            applicationIdSuffix ".youfone"
-            versionCode 1
-            versionName "1.0"
-            resValue "string", "app_name", "YouFone"
-        }
-        bbg {
-            dimension "bridge"
-            applicationIdSuffix ".bbg"
-            versionCode 10
-            versionName "1.8"
-            resValue "string", "app_name", "BBG"
-        }
-        kijk {
-            dimension "bridge"
-            applicationIdSuffix ".kijk"
-            versionCode 2
-            versionName "1.01"
-            resValue "string", "app_name", "KIJK"
-        }
-        rte {
-          dimension "bridge"
-          applicationIdSuffix ".rte"
-          versionCode 5
-          versionName "1.0.2"
-          resValue "string", "app_name", "RTE"
-        }
-        alhurra {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".alhurra"
-            versionCode 1000800
-            versionName "1.0.8"
-            resValue "string", "app_name", "Alhurra"
-        }
-        marti {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".marti"
-            versionCode 1000800
-            versionName "1.0.8"
-            resValue "string", "app_name", "Marti"
-        }
-        voa {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".voa"
-            versionCode 1000800
-            versionName "1.0.8"
-            resValue "string", "app_name", "VOA"
-        }
-        voa365 {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".voa365"
-            versionCode 1000300
-            versionName "1.0.3"
-            resValue "string", "app_name", "VOA 365"
-        }
-        rfe {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".rfe"
-            versionCode 1000100
-            versionName "1.0.1"
-            resValue "string", "app_name", "RFE"
-        }
         bigscreenAppstage {
             // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
             dimension "bridge"
-            versionCode 1000100
-            versionName "1.0.1"
-            applicationId "com.twentyfouri.app.appstagebigscreen"
-            resValue "string", "app_name", "Appstage BIGscreen"
-        }
-        pureflix {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            versionCode 5000900
-            versionName "5.0.9"
-            // Android TV
-            applicationId "com.pureflix"
-            resValue "string", "app_name", "PureFlix (Android TV)"
-            // Fire TV
-//            applicationId "com.rollingstorm.pureflixFTV"
-//            resValue "string", "app_name", "PureFlix"
-        }
-        rfa {
-            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
-            dimension "bridge"
-            applicationIdSuffix ".rfa"
-            versionCode 1000300
-            versionName "1.0.3"
-            resValue "string", "app_name", "RFA"
-        }
-        fuse {
-            dimension "bridge"
-            applicationIdSuffix ".fuse"
-            versionCode 3
-            versionName "1.0.2"
-            resValue "string", "app_name", "Fuse"
-        }
-        gsn {
-            dimension "bridge"
-            applicationId "com.gsn.apptv"  // production
-//            applicationId "com.gsn.test.apptv"  // staging
-            versionCode 1000900
-            versionName "1.0.9"
-            resValue "string", "app_name", "GSN"
-        }
-        topic {
-            dimension "bridge"
-            applicationId "com.flm.topictv"  // production
-//            applicationId "com.twentyfouri.tvbridge.topic"  // staging
-            versionCode 1010000
-            versionName "1.1.0"
-            resValue "string", "app_name", "Topic"
-        }
-        broadwayhd {
-            dimension "bridge"
-            applicationId "com.broadwayhd.apptv"  // production
-//            applicationId "com.twentyfouri.tvbridge.broadwayhd"  // staging
-            versionCode 1000700
-            versionName "1.0.7"
-            resValue "string", "app_name", "BroadwayHD"
-        }
-        kpn {
-            dimension "bridge"
-            applicationId "com.twentyfouri.kpnandroidtv"
-            versionCode 2
-            versionName "0.0.2"
-            resValue "string", "app_name", "KPN iTV"
-        }
+            versionCode {{APP_VERSION_CODE}}
+            versionName "{{APP_VERSION_NAME}}"
+            applicationId "{{configProps.id}}"
+            resValue "string", "app_name", "{{configProps.appName}}"
+        }
+        // bigscreenAppstage {
+        //     // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
+        //     dimension "bridge"
+        //     versionCode 1000100
+        //     versionName "1.0.1"
+        //     applicationId "com.twentyfouri.app.appstagebigscreen"
+        //     resValue "string", "app_name", "Appstage BIGscreen"
+        // }
     }
 
     sourceSets {

package/dist/templates/platforms/androidtv/project/app/src/bigscreenAppstage/res/raw/configuration.json

@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://smartapps-bigscreen.appstage-bigscreen.24imedia.com.s3.amazonaws.com/builds/androidtv/animated_720/demo/index.html",
+  "baseUrl": "{{APP_URL}}",
   "drm": {
     "overrideDrmCallback": true
   }

package/package.json

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