switch version to 4.14
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/96c064e6 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/96c064e6 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/96c064e6 Branch: refs/heads/develop Commit: 96c064e6b9ef591d6acff136f22182d3af868edf Parents: b88b345 Author: Alex Harui <aha...@apache.org> Authored: Tue Aug 12 13:09:41 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Aug 12 13:09:41 2014 -0700 ---------------------------------------------------------------------- build.properties | 4 ++-- build/set-version.xml | 10 +++++----- .../projects/advancedgrids/src/mx/core/Version.as | 2 +- .../projects/airframework/src/mx/core/Version.as | 2 +- .../projects/airspark/src/spark/core/Version.as | 2 +- frameworks/projects/apache/src/core/Version.as | 2 +- .../projects/automation/src/mx/core/Version.as | 2 +- .../automation_agent/src/mx/core/Version.as | 2 +- .../projects/automation_air/src/mx/core/Version.as | 2 +- .../projects/automation_dmv/src/mx/core/Version.as | 2 +- .../automation_flashflexkit/src/mx/core/Version.as | 2 +- .../automation_spark/src/mx/core/Version.as | 2 +- .../automation_spark/src/spark/core/Version.as | 2 +- frameworks/projects/charts/src/mx/core/Version.as | 2 +- .../projects/framework/src/mx/core/FlexVersion.as | 16 +++++++++++++++- .../projects/framework/src/mx/core/Version.as | 2 +- frameworks/projects/mx/src/mx/core/Version.as | 2 +- frameworks/projects/rpc/src/mx/core/Version.as | 2 +- frameworks/projects/spark/src/spark/core/Version.as | 2 +- .../projects/spark_dmv/src/spark/core/Version.as | 2 +- frameworks/projects/tool/src/mx/core/Version.as | 2 +- frameworks/projects/tool_air/src/mx/core/Version.as | 2 +- .../flex2/compiler/common/MxmlConfiguration.java | 5 +++-- .../compiler/src/java/flex2/tools/VersionInfo.java | 2 +- 24 files changed, 45 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index 4303f2a..35fd073 100644 --- a/build.properties +++ b/build.properties @@ -18,8 +18,8 @@ ################################################################################ # flex-sdk-description values -release = Apache Flex 4.13.0 -release.version = 4.13.0 +release = Apache Flex 4.14.0 +release.version = 4.14.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/96c064e6/build/set-version.xml ---------------------------------------------------------------------- diff --git a/build/set-version.xml b/build/set-version.xml index 1841e0a..bbd83e3 100644 --- a/build/set-version.xml +++ b/build/set-version.xml @@ -102,7 +102,7 @@ with latest version info ${major} ${minor} ${nano} group="3" property="MAJOR"/> <grep in="${currVerInfo}" - regex="(public static String FLEX_MINOR_VERSION =) (")([0-9])("+)" + regex="(public static String FLEX_MINOR_VERSION =) (")([0-9]*)("+)" group="3" property="MINOR"/> <grep in="${currVerInfo}" @@ -117,7 +117,7 @@ with latest version info ${major}.${minor}.${nano}.0 <!-- Update all Version.as files in the frameworks directory--> <replaceregexp> - <regexp pattern='"[0-9].[0-9].[0-9].[0-9]";'/> + <regexp pattern='"[0-9].[0-9]*.[0-9].[0-9]";'/> <substitution expression='"${major}.${minor}.${nano}.0";'/> <fileset dir="${FLEX_HOME}/frameworks"> <include name="**/Version.as"/> @@ -130,11 +130,11 @@ update ${FLEX_HOME}/build.properties release.version to ${major}.${minor}.${nano <!--update build.properties--> <replaceregexp file="${FLEX_HOME}/build.properties"> - <regexp pattern="release.version = [0-9].[0-9].[0-9]"/> + <regexp pattern="release.version = [0-9].[0-9]*.[0-9]"/> <substitution expression="release.version = ${major}.${minor}.${nano}"/> </replaceregexp> <replaceregexp file="${FLEX_HOME}/build.properties"> - <regexp pattern="release = Apache Flex [0-9].[0-9]"/> + <regexp pattern="release = Apache Flex [0-9].[0-9]*"/> <substitution expression="release = Apache Flex ${major}.${minor}"/> </replaceregexp> @@ -148,7 +148,7 @@ update ${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java with <substitution expression='FLEX_MAJOR_VERSION = "${major}";'/> </replaceregexp> <replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java"> - <regexp pattern='FLEX_MINOR_VERSION = "[0-9]";'/> + <regexp pattern='FLEX_MINOR_VERSION = "[0-9]*";'/> <substitution expression='FLEX_MINOR_VERSION = "${minor}";'/> </replaceregexp> <replaceregexp file="${FLEX_HOME}/modules/compiler/src/java/flex2/tools/VersionInfo.java"> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/advancedgrids/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/core/Version.as b/frameworks/projects/advancedgrids/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/advancedgrids/src/mx/core/Version.as +++ b/frameworks/projects/advancedgrids/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/airframework/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/airframework/src/mx/core/Version.as b/frameworks/projects/airframework/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/airframework/src/mx/core/Version.as +++ b/frameworks/projects/airframework/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/airspark/src/spark/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/airspark/src/spark/core/Version.as b/frameworks/projects/airspark/src/spark/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/airspark/src/spark/core/Version.as +++ b/frameworks/projects/airspark/src/spark/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/apache/src/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/apache/src/core/Version.as b/frameworks/projects/apache/src/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/apache/src/core/Version.as +++ b/frameworks/projects/apache/src/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation/src/mx/core/Version.as b/frameworks/projects/automation/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation/src/mx/core/Version.as +++ b/frameworks/projects/automation/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_agent/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_agent/src/mx/core/Version.as b/frameworks/projects/automation_agent/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation_agent/src/mx/core/Version.as +++ b/frameworks/projects/automation_agent/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_air/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_air/src/mx/core/Version.as b/frameworks/projects/automation_air/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation_air/src/mx/core/Version.as +++ b/frameworks/projects/automation_air/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_dmv/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_dmv/src/mx/core/Version.as b/frameworks/projects/automation_dmv/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation_dmv/src/mx/core/Version.as +++ b/frameworks/projects/automation_dmv/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as index f261fc5..8d74c4e 100644 --- a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as +++ b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as @@ -24,4 +24,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_spark/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_spark/src/mx/core/Version.as b/frameworks/projects/automation_spark/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation_spark/src/mx/core/Version.as +++ b/frameworks/projects/automation_spark/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/automation_spark/src/spark/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_spark/src/spark/core/Version.as b/frameworks/projects/automation_spark/src/spark/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/automation_spark/src/spark/core/Version.as +++ b/frameworks/projects/automation_spark/src/spark/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/charts/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/core/Version.as b/frameworks/projects/charts/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/charts/src/mx/core/Version.as +++ b/frameworks/projects/charts/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 41c63fc..f99b634 100644 --- a/frameworks/projects/framework/src/mx/core/FlexVersion.as +++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as @@ -56,8 +56,22 @@ public class FlexVersion * @playerversion AIR 1.1 * @productversion Flex 3 */ - public static const CURRENT_VERSION:uint = 0x040D0000; + public static const CURRENT_VERSION:uint = 0x040E0000; + /** + * The <code>compatibilityVersion</code> value of Flex 4.14, + * 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.14 + */ + public static const VERSION_4_14:uint = 0x040E0000; + /** * The <code>compatibilityVersion</code> value of Flex 4.13, * encoded numerically as a <code>uint</code>. http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/framework/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/core/Version.as b/frameworks/projects/framework/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/framework/src/mx/core/Version.as +++ b/frameworks/projects/framework/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/mx/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/core/Version.as b/frameworks/projects/mx/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/mx/src/mx/core/Version.as +++ b/frameworks/projects/mx/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/rpc/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/rpc/src/mx/core/Version.as b/frameworks/projects/rpc/src/mx/core/Version.as index 9191675..496ab63 100644 --- a/frameworks/projects/rpc/src/mx/core/Version.as +++ b/frameworks/projects/rpc/src/mx/core/Version.as @@ -22,4 +22,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/spark/src/spark/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/core/Version.as b/frameworks/projects/spark/src/spark/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/spark/src/spark/core/Version.as +++ b/frameworks/projects/spark/src/spark/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/spark_dmv/src/spark/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark_dmv/src/spark/core/Version.as b/frameworks/projects/spark_dmv/src/spark/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/spark_dmv/src/spark/core/Version.as +++ b/frameworks/projects/spark_dmv/src/spark/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/tool/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/tool/src/mx/core/Version.as b/frameworks/projects/tool/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/tool/src/mx/core/Version.as +++ b/frameworks/projects/tool/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/frameworks/projects/tool_air/src/mx/core/Version.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/tool_air/src/mx/core/Version.as b/frameworks/projects/tool_air/src/mx/core/Version.as index 90b75ca..647c056 100644 --- a/frameworks/projects/tool_air/src/mx/core/Version.as +++ b/frameworks/projects/tool_air/src/mx/core/Version.as @@ -23,4 +23,4 @@ import mx.core.mx_internal; * @private * Version string for this class. */ -mx_internal static const VERSION:String = "4.13.0.0"; +mx_internal static const VERSION:String = "4.14.0.0"; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/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 6705d7b..228a50b 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_14 = 0x040e0000; public static final int VERSION_4_13 = 0x040d0000; public static final int VERSION_4_12_1 = 0x040c0001; public static final int VERSION_4_12 = 0x040c0000; @@ -62,10 +63,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_13; + public static final int CURRENT_VERSION = VERSION_4_14; public static final int EARLIEST_MAJOR_VERSION = 3; public static final int LATEST_MAJOR_VERSION = 4; - public static final int LATEST_MINOR_VERSION = 13; + public static final int LATEST_MINOR_VERSION = 14; private int major = LATEST_MAJOR_VERSION; private int minor = LATEST_MINOR_VERSION; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/96c064e6/modules/compiler/src/java/flex2/tools/VersionInfo.java ---------------------------------------------------------------------- diff --git a/modules/compiler/src/java/flex2/tools/VersionInfo.java b/modules/compiler/src/java/flex2/tools/VersionInfo.java index fe87538..8d7db5d 100644 --- a/modules/compiler/src/java/flex2/tools/VersionInfo.java +++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java @@ -32,7 +32,7 @@ import java.util.Properties; public class VersionInfo { public static String FLEX_MAJOR_VERSION = "4"; - public static String FLEX_MINOR_VERSION = "13"; + public static String FLEX_MINOR_VERSION = "14"; public static String FLEX_NANO_VERSION = "0"; /**
