From 45af6c2a501b086c1efb91aff9458fb0ea41cadf Mon Sep 17 00:00:00 2001 From: shmyga Date: Fri, 12 Oct 2018 15:49:06 +0300 Subject: [PATCH] up dependencies versions --- gulpfile.js | 6 ++++-- package.json | 10 +++++----- src/client/haxe/ru/m/tankz/Const.hx | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f9146ff..c35d9bc 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,10 +3,12 @@ const gulp = require('gulp'); const gulpClean = require('gulp-clean'); const Config = require('./config.json'); const packageInfo = require('./package.json'); -const {Sdk, Haxe, Project} = require('gulp-haxetool'); +const {Sdk, Haxe, Project, FlashPlayer} = require('gulp-haxetool'); const dateformat = require('dateformat'); +// ToDo: update default in gulp-haxetool +FlashPlayer.VERSION = '31'; if (Config.SdkDir) { Sdk.dir = Config.SdkDir; } @@ -68,7 +70,7 @@ const client = new Project( sources: ['src/client/haxe'], main: 'ru.m.tankz.Client', assets: ['src/client/resources'], - flags: ['bitmap_text'], + //flags: ['bitmap_text'], }), module.exports.generate ).bind(module, gulp); diff --git a/package.json b/package.json index 72207a1..c9f65dd 100755 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "dateformat": "^3.0.3", "gulp": "^4.0.0", "gulp-clean": "^0.4.0", - "gulp-haxetool": "^0.0.13" + "gulp-haxetool": "^0.0.14" }, "haxeDependencies": { - "lime": "6.0.1", - "openfl": "7.0.0", - "hxcpp": "3.4.188", + "haxework": "0.8.2", + "lime": "7.1.1", + "openfl": "8.5.1", + "hxcpp": "4.0.4", "promhx": "1.1.0", "protohx": "0.4.6", "yaml": "1.3.0", - "haxework": "git@bitbucket.org:shmyga/haxework.git", "orm": "2.1.0", "yield": "1.1.2", "haxe-crypto": "0.0.7" diff --git a/src/client/haxe/ru/m/tankz/Const.hx b/src/client/haxe/ru/m/tankz/Const.hx index cda81df..878726e 100755 --- a/src/client/haxe/ru/m/tankz/Const.hx +++ b/src/client/haxe/ru/m/tankz/Const.hx @@ -11,9 +11,9 @@ class Const { public static var DEBUG:Bool; public static function init():Void { - FPS = Lib.current.stage.application.config.fps; + FPS = Std.parseInt(Lib.current.stage.application.meta.get("fps")); BUILD = CompilationOption.get("build"); - VERSION = Lib.current.stage.application.config.version; + VERSION = Lib.current.stage.application.meta.get("version"); DEBUG = Capabilities.isDebugger; } } \ No newline at end of file