Skip to content
This repository was archived by the owner on Jul 2, 2020. It is now read-only.

Commit 1389c31

Browse files
author
oraclejet
committed
Release 2.3.0
1 parent 2585b53 commit 1389c31

File tree

12 files changed

+197
-189
lines changed

12 files changed

+197
-189
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to grunt-oraclejet
22

3-
*Copyright (c) 2014,2016 Oracle and/or its affiliates
3+
*Copyright (c) 2014, 2017 Oracle and/or its affiliates
44
The Universal Permissive License (UPL), Version 1.0*
55

66
**Pull requests are currently not being accepted for the Oracle JET project.**

Gruntfile.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2016, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates.
33
The Universal Permissive License (UPL), Version 1.0
44
*/
55
module.exports = function (grunt) {
@@ -16,9 +16,13 @@ module.exports = function (grunt) {
1616
src : "build/*.js"
1717
},
1818
pkg: grunt.file.readJSON("package.json"),
19-
jet_version_token:'2.2.0',
20-
jet_doc_version_token:'undefined',
21-
version_token:'2.2.0'
19+
tooling_project: 'Tooling_V2.3.0',
20+
build_urls: grunt.file.readJSON("buildconf.json"),
21+
jet_version_token:'2.3.0',
22+
jet_doc_version_token:'230',
23+
version_token:'2.3.0',
24+
tooling_project_token:'Tooling_V2.3.0',
25+
current_year_token: '2017'
2226
}
2327
var configs = require('load-grunt-configs')(grunt, options);
2428
grunt.config.merge(configs);

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717

1818

1919
```
20-
Copyright (c) 2014, 2016 Oracle and/or its affiliates
20+
Copyright (c) 2014, 2017 Oracle and/or its affiliates
2121
The Universal Permissive License (UPL), Version 1.0
2222
2323
Subject to the condition set forth below, permission is hereby granted to any person obtaining

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
# grunt-oraclejet 2.2.0
2-
3-
> Build and serve tasks for Oracle JET web and mobile applications
1+
# grunt-oraclejet 2.3.0
42

53
## About the module
64
This module contains build and serve tasks for Oracle JET web and hybrid mobile applications.
75

86
This is an open source project maintained by Oracle Corp.
97

108
## Installation
11-
The grunt-oraclejet module will be automatically installed if you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet220/jet/).
9+
The grunt-oraclejet module will be automatically installed if you scaffold a web or hybrid mobile app following the [Oracle JET Developers Guide](http://docs.oracle.com/middleware/jet230/jet/).
1210

1311
### Manual installation
1412
This plugin requires Grunt `~1.0.1`
@@ -96,5 +94,5 @@ Oracle JET is an open source project. Pull Requests are currently not being acc
9694
for details.
9795

9896
## [License](https://github.com/oracle/grunt-oraclejet/tree/master/LICENSE.md)
99-
Copyright (c) 2014, 2016 Oracle and/or its affiliates
97+
Copyright (c) 2014, 2017 Oracle and/or its affiliates
10098
The Universal Permissive License (UPL), Version 1.0

RELEASENOTES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## Release Notes for grunt-oraclejet ##
22

3-
### 2.2.0 (Oct 21, 2016)
4-
* No changes - refer to oraclejet-tooling README.md
3+
### 2.3.0
4+
* No changes - refer to generator-oraclejet RELEASENOTES.md

doc/help.txt

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project Commands
77
Default: dev
88
serve ................ Run JET project on local machine or connected device
99
help ................. Prints out this help
10-
10+
1111
Aliases
1212
build -> oraclejet-build
1313
serve -> oraclejet-serve
@@ -18,59 +18,66 @@ Grunt build options
1818
<path to build config file>
1919
--platform ........... Specify the platform for building the app
2020
[android, ios, windows, web]
21-
Default: if only one supported platform, that platform; otherwise a platform must be specified
22-
21+
Default: if only one supported platform, that platform; otherwise a platform must be specified
22+
23+
--platform-options ... Platform specific options for Cordova (hybrid apps only)
24+
<platform specific options>
25+
use quotes to pass multiple options as a single parameter value
26+
2327
--no-sass ............ Suppress SASS compilation
2428
--theme .............. Specify the theme for building the app
2529
<theme_name>[:<platform>]
2630
where <theme_name> is: alta or <custom theme name>
2731
and <platform> is one of: android, ios, web, windows
2832
Default: alta for the specified platform
29-
--themes ............. Specify multiple themes separated by comma. When --theme flag is missing,
33+
--themes ............. Specify multiple themes separated by comma. When --theme flag is missing,
3034
the first element in themes flag is identified as default theme.
3135
When --theme flag is present, build app using --theme as default.
32-
36+
3337
--destination ........ Specify the destination for building the app
3438
[device, emulator]
3539
Default: emulator
3640
--device ............. Shortcut for --destination=device
3741
--emulator ........... Shortcut for --destination=emulator
38-
42+
3943
Grunt serve options
40-
44+
4145
--build-config ....... Specify the build config file for serving hybrid app
4246
<path to build config file>
4347
--no-build ........... Suppress build
4448
--platform ........... Specify the platform for serving the app
4549
[android, ios, windows, web]
4650
Default: if only one supported platform, that platform; otherwise <none>
47-
51+
52+
--platform-options ... Platform specific options for Cordova (hybrid apps only)
53+
<platform specific options>
54+
use quotes to pass multiple options as a single parameter value
55+
4856
--server-port ........ Specify the server port
4957
<integer>
5058
Default: 8000
51-
59+
5260
--no-sass ............ Suppress SASS compilation & SASS watch
5361
--theme .............. Specify the theme for building the app
5462
<theme_name>[:<platform>]
5563
where <theme_name> is: alta or <custom theme name>
5664
and <platform> is one of: android, ios, web, windows
5765
Default: alta for the specified platform
58-
--themes ............. Specify multiple themes separated by comma. When --theme flag is missing,
66+
--themes ............. Specify multiple themes separated by comma. When --theme flag is missing,
5967
the first element in themes flag is identified as default theme.
6068
When --theme flag is present, build app using --theme as default.
61-
69+
6270
--no-livereload ...... Disable live reload
6371
--livereload-port .... Specify the live reload port
6472
<integer>
6573
Default: 35729
66-
74+
6775
--destination ........ Specify the destination for serving the app
68-
[device, emulator, browser, server-only, <name of emulator/simulator>]
76+
[device[:<device-name>], emulator[:<emulator-name>],
77+
browser[:chrome, firefox, edge, ie, opera, safari],
78+
server-only, <device-or-emulator-name>]
6979
Default: emulator
70-
--target ............. Specify the browser to be used when launching the app in a browser.
71-
Only applicable to web apps, or to hybrid apps when the destination is 'browser'.
72-
[chrome, edge, ie, firefox, safari]
73-
Default: chrome
80+
Default browser: chrome
7481
--browser ............ Shortcut for --destination=browser
7582
--device ............. Shortcut for --destination=device
7683
--emulator ........... Shortcut for --destination=emulator
@@ -79,5 +86,6 @@ Grunt serve options
7986
Examples
8087
grunt build --platform=ios
8188
grunt build --platform=android --destination=device
89+
grunt build --platform=windows --platform-options="--arch=arm --appx=uap"
8290
grunt serve --browser
8391
grunt serve --no-sass --no-livereload

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grunt-oraclejet",
33
"description": "Build and serve tasks for Oracle JET web and mobile applications",
4-
"version": "2.2.0",
4+
"version": "2.3.0",
55
"license": "UPL-1.0",
66
"homepage": "http://oraclejet.org",
77
"main": "tasks/build.js",
@@ -19,16 +19,17 @@
1919
},
2020
"dependencies":
2121
{
22-
"oraclejet-tooling": "~2.2.0"
23-
},
22+
"oraclejet-tooling": "~2.3.0"
23+
},
2424
"devDependencies": {
2525
"grunt": "^1.0.1",
2626
"grunt-contrib-clean": "^1.0.0",
2727
"grunt-contrib-copy": "^1.0.0",
28-
"load-grunt-configs": "^0.4.3",
29-
"load-grunt-tasks": "3.5.0"
28+
"load-grunt-configs": "^1.0.0",
29+
"load-grunt-tasks": "^3.5.2"
3030
},
3131
"keywords": [
3232
"gruntplugin"
33-
]
33+
],
34+
"jetdocversion": "230"
3435
}

tasks/build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2016, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates.
33
The Universal Permissive License (UPL), Version 1.0
44
*/
55
'use strict';
@@ -24,6 +24,7 @@ module.exports = function (grunt) {
2424
options.themes = utils.validateThemes(grunt.option('themes'));
2525
options.sassCompile = grunt.option('sass');
2626
options.destination = _getDestination(grunt);
27+
options.platformOptions = utils.validatePlatformOptions(grunt.option('platform-options'), platform);
2728
ojet.build(platform, options)
2829
.then(() => {
2930
done();

tasks/configs.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2016, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates.
33
The Universal Permissive License (UPL), Version 1.0
44
*/
55
'use strict';
@@ -15,7 +15,8 @@ module.exports = {
1515
'sass',
1616
'theme',
1717
'themes',
18-
'no-sass'
18+
'no-sass',
19+
'platform-options'
1920
],
2021
deprecations: [{
2122
flag: 'buildConfig',
@@ -36,11 +37,11 @@ module.exports = {
3637
'platform',
3738
'server-port',
3839
'server-only',
39-
'target',
4040
'theme',
4141
'themes',
4242
'sass',
43-
'no-sass'
43+
'no-sass',
44+
'platform-options'
4445
],
4546
deprecations: [{
4647
flag: 'buildConfig',

tasks/help.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
Copyright (c) 2015, 2016, Oracle and/or its affiliates.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates.
33
The Universal Permissive License (UPL), Version 1.0
44
*/
55
'use strict';

0 commit comments

Comments
 (0)