You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/03/07 02:13:56 UTC

git commit: [flex-sdk] [refs/heads/develop] - Changed version from 4.12 to 4.13

Repository: flex-sdk
Updated Branches:
  refs/heads/develop cad53c1bf -> be20e5cde


Changed version from 4.12 to 4.13


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/be20e5cd
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/be20e5cd
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/be20e5cd

Branch: refs/heads/develop
Commit: be20e5cdeeba6998823a7393244abfd2009ec311
Parents: cad53c1
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Mar 7 12:13:39 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Mar 7 12:13:39 2014 +1100

----------------------------------------------------------------------
 build.properties                                    |  4 ++--
 .../projects/framework/src/mx/core/FlexVersion.as   | 16 +++++++++++++++-
 .../flex2/compiler/common/MxmlConfiguration.java    |  5 +++--
 3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/be20e5cd/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 5cf4111..59977fb 100644
--- a/build.properties
+++ b/build.properties
@@ -18,8 +18,8 @@
 ################################################################################
 
 # flex-sdk-description values
-release = Apache Flex 4.12.0
-release.version = 4.12.0
+release = Apache Flex 4.13.0
+release.version = 4.13.0
 
 # override on command line with -Dbuild.number=999 or in local.properties
 build.number = 0

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/be20e5cd/frameworks/projects/framework/src/mx/core/FlexVersion.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/core/FlexVersion.as b/frameworks/projects/framework/src/mx/core/FlexVersion.as
index 115ce9f..41c63fc 100644
--- a/frameworks/projects/framework/src/mx/core/FlexVersion.as
+++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as
@@ -56,9 +56,23 @@ public class FlexVersion
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    public static const CURRENT_VERSION:uint = 0x040C0000;
+    public static const CURRENT_VERSION:uint = 0x040D0000;
 	
 	/** 
+	 *  The <code>compatibilityVersion</code> value of Flex 4.13,
+	 *  encoded numerically as a <code>uint</code>.
+	 *  Code can compare this constant against
+	 *  the <code>compatibilityVersion</code>
+	 *  to implement version-specific behavior.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 11
+	 *  @playerversion AIR 3
+	 *  @productversion Apache Flex 4.13
+	 */
+	public static const VERSION_4_13:uint = 0x040D0000;
+
+	/** 
 	 *  The <code>compatibilityVersion</code> value of Flex 4.12,
 	 *  encoded numerically as a <code>uint</code>.
 	 *  Code can compare this constant against

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/be20e5cd/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
index caf564a..d496c32 100644
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@ -48,6 +48,7 @@ public class MxmlConfiguration
     //
     // 'compiler.mxml.compatibility-version' option
     //
+	public static final int VERSION_4_13 = 0x040d0000;
 	public static final int VERSION_4_12 = 0x040c0000;
 	public static final int VERSION_4_11 = 0x040b0000;
 	public static final int VERSION_4_10 = 0x040a0000;
@@ -60,10 +61,10 @@ public class MxmlConfiguration
     public static final int VERSION_3_0 = 0x03000000;
     public static final int VERSION_2_0_1 = 0x02000001;
     public static final int VERSION_2_0 = 0x02000000;
-    public static final int CURRENT_VERSION = VERSION_4_12;
+    public static final int CURRENT_VERSION = VERSION_4_13;
     public static final int EARLIEST_MAJOR_VERSION = 3;
     public static final int LATEST_MAJOR_VERSION = 4;
-    public static final int LATEST_MINOR_VERSION = 12;
+    public static final int LATEST_MINOR_VERSION = 13;
 
 	private int major = LATEST_MAJOR_VERSION;
 	private int minor = LATEST_MINOR_VERSION;