Skip to content

Commit 3430bc9

Browse files
author
vhristov5555
committed
PC-2018.1.4 <vhristov@vhristov Merge branch 'master'
2 parents 3e520ed + 26e1482 commit 3430bc9

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

_windows/laf.xml

-5
This file was deleted.

codestyles/Default.xml

-1
This file was deleted.

core/settings/settings.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ def resolve_path(package_env, default_value):
9797
ANDROID_PATH = resolve_path("android", ANDROID_PATH)
9898
IOS_PATH = resolve_path("ios", IOS_PATH)
9999
IOS_INSPECTOR_PATH = resolve_path("ios-inspector", IOS_INSPECTOR_PATH)
100-
WEBPACK_PACKAGE = resolve_package("nativescript-dev-webpack", "nativescript-dev-webpack@{0}".format(TAG))
101-
SASS_PACKAGE = resolve_package("nativescript-dev-sass", "nativescript-dev-sass@{0}".format(TAG))
102-
TYPESCRIPT_PACKAGE = resolve_package("nativescript-dev-typescript", "nativescript-dev-typescript@{0}".format(TAG))
103-
ANGULAR_PACKAGE = resolve_package("nativescript-angular", "nativescript-angular@{0}".format(TAG))
100+
WEBPACK_PACKAGE = resolve_package("nativescript-dev-webpack", "nativescript-dev-webpack@next")
101+
SASS_PACKAGE = resolve_package("nativescript-dev-sass", "nativescript-dev-sass@next")
102+
TYPESCRIPT_PACKAGE = resolve_package("nativescript-dev-typescript", "nativescript-dev-typescript@next")
103+
ANGULAR_PACKAGE = resolve_package("nativescript-angular", "nativescript-angular@next")
104104
MODULES_PACKAGE = resolve_package("tns-core-modules", "tns-core-modules@{0}".format(TAG))
105105

106106
# Output settings

debugger.xml

-6
This file was deleted.

0 commit comments

Comments
 (0)