Merge pull request #17 from openfin/build/1.4.0.0

Merging without review
openfin · Aug 9, 2017 · 4e5c34f · 4e5c34f
2 parents b9b8720 + 351e24b
commit 4e5c34f
Show file tree

Hide file tree

Showing 8 changed files with 300 additions and 255 deletions.
diff --git a/app.json b/app.json
@@ -13,7 +13,7 @@
   },
   "runtime": {
     "arguments": "",
-    "version": "stable"
+    "version": "6.*"
   },
   "splashScreenImage": "http://openfin.github.io/excel-api-example/web/splash_excel.png",
   "shortcut": {
@@ -26,7 +26,7 @@
     {
       "src": "http://openfin.github.io/excel-api-example/web/add-in.zip",
       "alias": "excel-api-addin",
-      "version": "1.3.0"
+      "version": "1.4.0"
     }
   ]
 }
diff --git a/dev-app.json b/dev-app.json
@@ -14,7 +14,7 @@
   },
   "runtime": {
     "arguments": "",
-    "version": "stable"
+    "version": "6.*"
   },
   "splashScreenImage": "http://localhost:8080/web/splash_excel.png",
   "shortcut": {
@@ -27,7 +27,7 @@
     {
       "src": "http://localhost:8080/web/add-in.zip",
       "alias": "excel-api-addin",
-      "version": "1.3.0",
+      "version": "1.4.0",
       "forceDownload": true
     }
   ]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "excel-api-example",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Excel integration for OpenFin",
   "main": "main.js",
   "dependencies": {},

diff --git a/src/ExcelApplication.js b/src/ExcelApplication.js
diff --git a/src/ExcelWorkbook.js b/src/ExcelWorkbook.js
diff --git a/src/ExcelWorksheet.js b/src/ExcelWorksheet.js
diff --git a/web/add-in.zip b/web/add-in.zip
diff --git a/web/excel-api-example.js b/web/excel-api-example.js