Fixed dependency issues with Wavesurfer

Matt Karl · Matt Karl · commit 523711f436b8 · 2015-02-23T10:49:34.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",
diff --git a/deploy/assets/js/saveDialog.js b/deploy/assets/js/saveDialog.js
diff --git a/deploy/index.html b/deploy/index.html
@@ -3,14 +3,14 @@
 	<head>
 		<meta charset="utf-8">
 		<title>SpringRoll Studio</title>
-		<link href="assets/css/libraries.css?v=0.2.0-alpha" rel="stylesheet">
-		<link href="assets/css/main.css?v=0.2.0-alpha" rel="stylesheet">
-		<script src="assets/js/libraries.js?v=0.2.0-alpha"></script>
-		<script src="assets/js/main.js?v=0.2.0-alpha"></script>
+		<link href="assets/css/libraries.css?v=0.2.1" rel="stylesheet">
+		<link href="assets/css/main.css?v=0.2.1" rel="stylesheet">
+		<script src="assets/js/libraries.js?v=0.2.1"></script>
+		<script src="assets/js/main.js?v=0.2.1"></script>
 	</head>
 	<body>
 		<header>
-			<img src="assets/images/icon.png?v=0.2.0-alpha" class="logo">
+			<img src="assets/images/icon.png?v=0.2.1" class="logo">
 		</header>
 		<nav class="modules btn-group">
 			<a class="btn btn-sm btn-primary" href="new.html" id="new" target="_blank" title="New Project" data-width="550" data-height="670" data-resizable="false">
@@ -41,6 +41,6 @@
 				<span class="icon glyphicon glyphicon-send"></span> Remote Trace
 			</a>
 		</div>
-		<footer class="version">Version <span id="version">0.2.0</span></footer>
+		<footer class="version">Version <span id="version">0.2.1</span></footer>
 	</body>
 </html>
diff --git a/deploy/package.json b/deploy/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"
diff --git a/installer/win32.nsi b/installer/win32.nsi
@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 0
+!define VERSIONBUILD 1
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"
diff --git a/installer/win64.nsi b/installer/win64.nsi
@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 0
+!define VERSIONBUILD 1
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"
diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "SpringRollStudio",
 	"private": true,
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"dependencies": {
-		"grunt": "~0.4.5",
+		"grunt": "^0.4.5",
 		"grunt-contrib-copy": "^0.7.0",
-		"grunt-exec": "~0.4.6",
-		"grunt-node-webkit-builder": "~1.0.0",
-		"lodash": "~3.0.0",
+		"grunt-exec": "^0.4.6",
+		"grunt-node-webkit-builder": "^1.0.0",
+		"lodash": "^3.0.0",
 		"project-grunt": "*"
 	}
 }
diff --git a/project.json b/project.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/utils/Browser.js",
@@ -23,11 +23,7 @@
 		"components/bootstrap/less/theme.less",
 		"components/bootstrap-confirmation/bootstrap-confirmation.js",
 		"components/underscore/underscore.js",
-		"components/wavesurfer.js/src/wavesurfer.js",
-		"components/wavesurfer.js/src/webaudio.js",
-		"components/wavesurfer.js/src/audioelement.js",
-		"components/wavesurfer.js/src/drawer.js",
-		"components/wavesurfer.js/src/drawer.*.js"
+		"components/wavesurfer.js/build/wavesurfer.min.js"
 	],
 	"librariesDebug": [
 		"components/jquery/dist/jquery.js",
@@ -42,11 +38,7 @@
 		"components/bootstrap/less/theme.less",
 		"components/bootstrap-confirmation/bootstrap-confirmation.js",
 		"components/underscore/underscore.js",
-		"components/wavesurfer.js/src/wavesurfer.js",
-		"components/wavesurfer.js/src/webaudio.js",
-		"components/wavesurfer.js/src/audioelement.js",
-		"components/wavesurfer.js/src/drawer.js",
-		"components/wavesurfer.js/src/drawer.*.js"
+		"components/wavesurfer.js/build/wavesurfer.min.js"
 	],
 	"modules": {
 		"shared": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "0.2.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"jqueryui": "*",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`	`3`	`"description": "Application for SpringRoll projects",`
`4`		`- "version": "0.2.0",`
	`4`	`+ "version": "0.2.1",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"url": "https://github.com/SpringRoll/SpringRollStudio"`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.2.0",`
	`4`	`+ "version": "0.2.1",`
`5`	`5`	`"dependencies": {`
`6`		`- "grunt": "~0.4.5",`
	`6`	`+ "grunt": "^0.4.5",`
`7`	`7`	`"grunt-contrib-copy": "^0.7.0",`
`8`		`- "grunt-exec": "~0.4.6",`
`9`		`- "grunt-node-webkit-builder": "~1.0.0",`
`10`		`- "lodash": "~3.0.0",`
	`8`	`+ "grunt-exec": "^0.4.6",`
	`9`	`+ "grunt-node-webkit-builder": "^1.0.0",`
	`10`	`+ "lodash": "^3.0.0",`
`11`	`11`	`"project-grunt": "*"`
`12`	`12`	`}`
`13`	`13`	`}`