Skip to content

Commit

Permalink
Version 3.2.3
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 5296d83648fa769f12aa14fc1af74d92b74baa97
  • Loading branch information
Interfaced authored and l1bbcsg committed Nov 5, 2020
1 parent 540a210 commit b999289
Show file tree
Hide file tree
Showing 6 changed files with 2,926 additions and 1,607 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const currentYear = (new Date).getFullYear();
const currentYear = (new Date()).getFullYear();
const copyrightHeader = [
'',
' * This file is part of the ZombieBox package.',
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 3.2.3 (05.11.2020)
* Fix application resources not being copied to build when `useBundledHtml` set to true and resources are not inlined.
* Implement `IStatefulVideo.getEngine` method

## 3.2.2 (03.02.2020)
* Support ZombieBox 2.6
* Better logging and output
Expand Down
20 changes: 14 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,18 @@ class PlatformAndroid extends AbstractPlatform {
* @protected
*/
async _copyZbApplication(config, distDir, buildDir) {
if (config.useBundledHTML) {
const zbAppPath = path.join(distDir, 'index.html');
const distAppPath = path.join(buildDir, 'app', 'src', config.namespace, 'assets', 'html', 'index.html');
await fse.ensureDir(path.dirname(distAppPath));
await fse.copy(zbAppPath, distAppPath);
if (!config.useBundledHTML) {
return;
}
const targetPath = path.join(buildDir, 'app', 'src', config.namespace, 'assets', 'html');

const files = (await fse.readdir(distDir))
.map((file) => path.join(distDir, file))
.filter((file) => file !== buildDir);

logger.verbose(`Copying: ${files.join(', ')} to ${targetPath}`);

await Promise.all(files.map((file) => fse.copy(file, path.join(targetPath, path.basename(file)))));
}

/**
Expand All @@ -262,7 +268,9 @@ class PlatformAndroid extends AbstractPlatform {
const baseResourcesPath = path.join(buildDir, 'app', 'src', config.namespace, 'res');

let resolvePrimer;
const primer = new Promise((resolve) => (resolvePrimer = resolve));
const primer = new Promise((resolve) => {
resolvePrimer = resolve;
});
const promises = [primer];

klaw(baseResourcesPath, {
Expand Down
8 changes: 8 additions & 0 deletions lib/stateful-video.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,14 @@ export default class StatefulVideo extends AbstractStatefulVideo {
return Promise.resolve();
}

/**
* @override
* @return {AndroidPlayerAPI}
*/
getEngine() {
return this._engine;
}

/**
* @param {VideoOptimisation} type
*/
Expand Down
Loading

0 comments on commit b999289

Please sign in to comment.