Prep for 3.1.0 release

framework-one · Jul 13, 2015 · a4dad1e · a4dad1e
1 parent fbaf04f
commit a4dad1e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/examples/render/controllers/render.cfc b/examples/render/controllers/render.cfc
@@ -19,7 +19,8 @@ component {
     }
 
     public void function jsonObject( struct rc ) {
-        variables.fw.renderData( 'json', [ "An", "array", { "containing" = "data" } ] );
+        // variables.fw.renderData( 'json', [ "An", "array", { "containing" = "data" } ] );
+        variables.fw.renderData( 'json', [], 200 );
     }
 
     public void function jsonString( struct rc ) {

diff --git a/examples/todos/assets/todo.json b/examples/todos/assets/todo.json
@@ -1 +1 @@
-{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"New","title":"Test the new todos app"}}
+{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"Pending","title":"Go to Pride!"}}
diff --git a/framework/WireBoxAdapter.cfc b/framework/WireBoxAdapter.cfc
@@ -1,5 +1,5 @@
 component extends="wirebox.system.ioc.Injector" {
-    variables._fw1_version = "3.1.0-rc3";
+    variables._fw1_version = "3.1.0";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 

diff --git a/framework/aop.cfc b/framework/aop.cfc
@@ -1,6 +1,6 @@
 component extends="framework.ioc" {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._aop1_version = "2.0.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._aop1_version = "2.0.0";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 

diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._aop1_version = "2.0.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._aop1_version = "2.0.0";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 

diff --git a/framework/ioc.cfc b/framework/ioc.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._di1_version = "1.1.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._di1_version = "1.1.0";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 

diff --git a/framework/one.cfc b/framework/one.cfc
@@ -1,5 +1,5 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
+    variables._fw1_version = "3.1.0";
 /*
     Copyright (c) 2009-2015, Sean Corfield, Marcin Szczepanski, Ryan Cogswell
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"New","title":"Test the new todos app"}}
		{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"Pending","title":"Go to Pride!"}}