Skip to content

Commit

Permalink
upgrading to ionic 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lathonez committed Jan 26, 2017
1 parent 02d21cd commit bac5ce3
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 22 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<a name="2.7.0"></a>
# 2.7.0 (2017-01-26)

### Features

* **Update**: Update to Ionic 2.0.0 FINAL ([](https://github.com/lathonez/clicker/commit/))

<a name="2.6.1"></a>
# 2.6.1 (2017-01-25)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ See the changelog [here](https://github.com/lathonez/clicker/blob/master/CHANGEL
## Dependencies

* **@Angular:** 2.2.1
* **angular-cli**: 1.0.0-beta.25-5
* **Ionic:** 2.0.0-rc.5
* **angular-cli**: 1.0.0-beta.26
* **Ionic:** 2.0.0
4 changes: 1 addition & 3 deletions angular-cli.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"project": {
"version": "1.0.0-beta.25-5",
"version": "1.0.0-beta.26",
"name": "clicker"
},
"apps": [
Expand All @@ -27,8 +27,6 @@
}
}
],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
Expand Down
4 changes: 3 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<author email="shazleto@gmail.com" href="http://ionicframework.com/">Stephen Hazleton</author>
<content src="index.html"/>
<access origin="*"/>
<allow-navigation href="http://ionic.local/*"/>
<allow-intent href="http://*/*"/>
<allow-intent href="https://*/*"/>
<allow-intent href="tel:*"/>
Expand All @@ -25,6 +26,7 @@
<preference name="BackupWebStorage" value="none"/>
<preference name="SplashMaintainAspectRatio" value="true"/>
<preference name="FadeSplashScreenDuration" value="300"/>
<preference name="SplashShowOnlyFirstTime" value="false"/>
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar"/>
</feature>
Expand All @@ -34,4 +36,4 @@
<plugin name="cordova-plugin-statusbar" spec="2.2.1"/>
<plugin name="cordova-plugin-device" spec="1.1.4"/>
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1"/>
</widget>
</widget>
30 changes: 16 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"homepage": "https://github.com/lathonez/clicker",
"private": true,
"scripts": {
"clean": "ionic-app-scripts clean",
"build": "ionic-app-scripts build",
"ionic:build": "ionic-app-scripts build",
"ionic:serve": "ionic-app-scripts serve",
"e2e": "ionic-app-scripts build && protractor",
Expand All @@ -12,44 +14,44 @@
"test": "ng test",
"test-coverage": "ng test --code-coverage"
},
"version": "2.6.1",
"version": "2.7.0",
"dependencies": {
"@angular/common": "2.2.1",
"@angular/compiler": "2.2.1",
"@angular/compiler-cli": "2.2.1",
"@angular/core": "2.2.1",
"@angular/forms": "2.2.1",
"@angular/http": "2.2.1",
"@angular/platform-browser": "2.2.1",
"@angular/platform-browser-dynamic": "2.2.1",
"@angular/platform-server": "2.2.1",
"@ionic/storage": "1.1.7",
"ionic-angular": "2.0.0-rc.5",
"ionic-native": "2.2.11",
"ionic-angular": "2.0.0",
"ionic-native": "2.4.1",
"ionicons": "3.0.0",
"rxjs": "5.0.0-beta.12",
"zone.js": "0.6.26",
"sw-toolbox": "3.4.0"
},
"devDependencies": {
"@angular/compiler-cli": "2.2.1",
"@ionic/app-scripts": "1.0.0",
"@types/jasmine": "2.5.38",
"@types/node": "6.0.42",
"angular-cli": "1.0.0-beta.25.5",
"@types/jasmine": "2.5.41",
"@types/node": "7.0.4",
"angular-cli": "1.0.0-beta.26",
"codecov": "1.0.1",
"jasmine-core": "2.5.2",
"jasmine-spec-reporter": "2.7.0",
"karma": "1.3.0",
"jasmine-spec-reporter": "2.5.0",
"karma": "1.4.0",
"karma-chrome-launcher": "2.0.0",
"karma-cli": "1.0.1",
"karma-jasmine": "1.1.0",
"karma-mocha-reporter": "2.2.1",
"karma-remap-istanbul": "0.2.2",
"karma-mocha-reporter": "2.2.2",
"karma-remap-istanbul": "0.4.0",
"protractor": "4.0.13",
"protractor-jasmine2-screenshot-reporter": "0.3.2",
"ts-node": "1.7.2",
"tslint": "4.1.1",
"tslint-eslint-rules": "3.2.0",
"ts-node": "1.2.1",
"tslint": "4.4.1",
"tslint-eslint-rules": "3.2.3",
"typescript": "2.0.10"
},
"cordovaPlugins": [
Expand Down
2 changes: 2 additions & 0 deletions src/test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import './polyfills.ts';

import 'zone.js/dist/long-stack-trace-zone';
Expand Down
2 changes: 1 addition & 1 deletion src/theme/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $colors: (
// The premium icon font for Ionic. For more info, please see:
// http://ionicframework.com/docs/v2/ionicons/

@import "ionicons";
@import "ionic.ionicons";


// Fonts
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
"atom": {
"rewriteTsconfig": false
}
}
}

0 comments on commit bac5ce3

Please sign in to comment.