Skip to content

Commit

Permalink
update to ng-cli 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
lathonez committed Jan 16, 2018
1 parent 2b6e111 commit debed2b
Show file tree
Hide file tree
Showing 11 changed files with 15,174 additions and 123 deletions.
14 changes: 9 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Editor configuration, see http://editorconfig.org
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
trim_trailing_whitespace = false
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<a name="2.24.0"></a>
# 2.24.0 (2018-01-16)
### Features

* **Update**: Update to Ionic 3.9.2 and @angular/cli 1.6.4 (implying @angular 5.0.3) ([](https://github.com/lathonez/clicker/commit/))

<a name="2.23.0"></a>
# 2.23.0 (2017-11-27)
### Features
Expand Down
13 changes: 6 additions & 7 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,12 @@
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
<splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
</platform>
<engine name="android" spec="6.4.0" />
<engine name="browser" spec="5.0.1" />
<engine name="ios" spec="4.5.4" />
<plugin name="cordova-plugin-console" spec="1.1.0" />
<plugin name="cordova-plugin-device" spec="1.1.7" />
<plugin name="cordova-plugin-splashscreen" spec="4.1.0" />
<plugin name="cordova-plugin-statusbar" spec="2.3.0" />
<plugin name="cordova-plugin-device" spec="2.0.1" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.1" />
<plugin name="cordova-plugin-statusbar" spec="2.4.1" />
<plugin name="cordova-plugin-whitelist" spec="1.3.3" />
<plugin name="ionic-plugin-keyboard" spec="2.2.1" />
<engine name="android" spec="7.0.0" />
<engine name="browser" spec="5.0.3" />
<engine name="ios" spec="4.5.4" />
</widget>
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ COPY . .
# Install some dependencies (git is needed for circle checkout)
RUN apt-get update && \
apt install -y wget git curl && \
curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
apt-get install -y nodejs && \
\
# Install Ionic global deps \
npm install -g ionic@3.19.0 cordova@7.1.0 && \
npm install -g ionic@3.19.0 cordova@8.0.0 && \
\
# Install Chrome \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
Expand Down
1 change: 1 addition & 0 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
Expand Down

0 comments on commit debed2b

Please sign in to comment.