@24i/smartapps-bigscreen-rnv-build-engine 0.17.2-alpha.2161 → 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

@@ -27,30 +27,99 @@ exports.handleAndroidTVSdk = exports.configureAndroidTVProject = exports.buildAn
 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 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');
-    const gradlew = './gradlew';
-    (0, child_process_1.execSync)(`cd ${rnv_1.Common.getPlatformProjectDir(c)} && ${gradlew} assembleBigscreenAppstageDebug`);
-    const output = path.join(rnv_1.Common.getPlatformProjectDir(c), 'name.apk');
-    rnv_1.Logger.logSuccess(`Your APK package is located in ${rnv_1.Logger.chalk().cyan(output)} .`);
+    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 apkFileName = `app-${flavourName}-debug.apk`;
+        const apkFilePath = path.join(projectDir, `app/build/outputs/apk/${flavourName}/debug/${apkFileName}`);
+        const gradlew = './gradlew';
+        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);
+        }
+        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 buildGradleFileName = 'build.gradle';
+    const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app', buildGradleFileName);
+    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: 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

@@ -234,10 +234,10 @@ android {
         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"
+            versionCode {{APP_VERSION_CODE}}
+            versionName "{{APP_VERSION_NAME}}"
+            applicationId "{{APP_ID}}"
+            resValue "string", "app_name", "{{configProps.appName}}"
         }
         pureflix {
             // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305

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/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.2161",
+	"version": "0.17.2-alpha.2163",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {