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

package/dist/src/resolvers/resolveBuildFileExtension.js

@@ -6,6 +6,7 @@ const resolveBuildFileExtension = (platform) => {
     switch (platform) {
         case constants_1.Platforms.TIZEN: return 'wgt';
         case constants_1.Platforms.WEBOS: return 'ipk';
+        case constants_1.Platforms.ANDROIDTV: return 'apk';
         default: return 'zip';
     }
 };

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

@@ -34,7 +34,13 @@ 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 resolvers_1 = require("../../resolvers");
 const constants_1 = require("../../constants");
+const flavourName = 'bigscreenAppstage';
+const buildType = 'debug';
+const capitalizeFirstLetter = (str) => {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+};
 const buildAndroidTVProject = async (c) => {
     rnv_1.Logger.logTask('buildAndroidTVProject');
     await (0, sdk_webpack_2.buildCoreWebpackProject)(c);
@@ -42,11 +48,13 @@ const buildAndroidTVProject = async (c) => {
         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`);
+        const taskBuildType = buildType === 'debug' ? 'Debug' : 'Release';
+        const taskFlavourName = capitalizeFirstLetter(flavourName);
+        const taskName = `assemble${taskFlavourName}${taskBuildType}`;
+        (0, child_process_1.execSync)(`cd ${projectDir} && ${gradlew} ${taskName}`);
         if (!fs.existsSync(tOut)) {
             fs.mkdirSync(tOut);
         }
@@ -60,27 +68,58 @@ const configureProject = (c) => {
     rnv_1.Logger.logTask('configureProject');
     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 version = semver.coerce(rnv_1.Common.getAppVersion(c, c.platform));
+    const semVerObj = semver.parse(version);
+    if (!semVerObj) {
+        throw new Error(`Failed to parse Application version: ${version}`);
+    }
+    const major = `${semVerObj.major}`.padStart(2, '0');
+    const minor = `${semVerObj.minor}`.padStart(2, '0');
+    const patch = `${semVerObj.patch}`.padStart(2, '0');
+    const versionCode = parseInt(`${major}${minor}${patch}00`, 10);
+    const appId = rnv_1.Common.getConfigProp(c, c.platform, 'id', '');
     const injects = [{
             pattern: '{{APP_VERSION_CODE}}',
             override: versionCode,
         }, {
             pattern: '{{APP_VERSION_NAME}}',
-            override: versionName,
+            override: version,
+        }, {
+            pattern: '{{APP_ID}}',
+            override: appId,
         }];
     rnv_1.Common.addSystemInjects(c, injects);
     rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
 };
+const getHostedAppEntryUrl = (c) => {
+    const { platform, runtime } = c;
+    const baseUrl = (0, resolvers_1.resolveBaseUrl)({
+        platform,
+        scheme: runtime.scheme || '',
+        flavour: runtime.appId,
+    });
+    return `${baseUrl}/public/index.html`;
+};
+const configureEntryUrl = (c) => {
+    rnv_1.Logger.logTask('configureEntryUrl');
+    const entryUrl = getHostedAppEntryUrl(c);
+    const configFileName = 'configuration.json';
+    const injects = [{
+            pattern: '{{APP_URL}}',
+            override: entryUrl,
+        }];
+    const file = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app/src', flavourName, 'res/raw', configFileName);
+    rnv_1.FileUtils.writeCleanFile(file, file, injects, null, c);
+};
 const configureAndroidTVProject = async (c) => {
     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 rnv_1.ProjectManager.copyAssetsFolder(c, platform, `app/src/${flavourName}/res`);
     await (0, sdk_webpack_1.configureCoreWebProject)(c);
     await configureAndroidProperties(c);
     configureProject(c);
+    configureEntryUrl(c);
     const gradlew = path.join(rnv_1.Common.getPlatformProjectDir(c), 'gradlew');
     fs.chmodSync(gradlew, '755');
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);

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

@@ -84,6 +84,7 @@ const buildFn = async (c, parentTask, originTask) => {
             break;
         case constants_1.Platforms.ANDROIDTV:
             await sdks_1.SDKAndroidtv.buildAndroidTVProject(c);
+            renameOutput(c);
             break;
         default:
             rnv_1.PlatformManager.logErrorPlatform(c);

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

@@ -70,22 +70,233 @@ 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 {{APP_VERSION_CODE}}
             versionName "{{APP_VERSION_NAME}}"
-            applicationId "{{configProps.id}}"
+            applicationId "{{APP_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"
-        // }
+        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"
+        }
     }
 
     sourceSets {

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

@@ -24,7 +24,7 @@ buildscript {
 ext {
     mavenRepositoryUrl = 'https://maven.pkg.github.com/24i/*'
     mavenRepositoryUsername = findProperty('github_username') ?: "24i"
-    mavenRepositoryPassword = findProperty('github_token') ?: System.getenv("GH_TOKEN")
+    mavenRepositoryPassword = findProperty('github_token') ?: System.getenv("GH_TOKEN") ?: System.getenv("GITHUB_TOKEN")
 }
 
 allprojects {

package/package.json

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