IMXMLTypeConstants: mx.core.FlexVersion should not have been converted to mx.core.RoyaleVersion This is used for Flex framework compilation. There is no RoyaleVersion class in royale-asjs

diff --git a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
index 178a82d..ba5ac2e 100644
--- a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
+++ b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java

@@ -5120,7 +5120,7 @@
     }
 
     /*
-     * Unlike the framework's RoyaleVersion.compatibilityVersionString, this
+     * Unlike the framework's FlexVersion.compatibilityVersionString, this
      * returns null rather than a string like "3.0.0" for the current version.
      * But if a -compatibility-version was specified, this string will always be
      * of the form N.N.N. For example, if -compatibility-version=2, this string

diff --git a/compiler-common/src/main/java/org/apache/royale/compiler/mxml/IMXMLTypeConstants.java b/compiler-common/src/main/java/org/apache/royale/compiler/mxml/IMXMLTypeConstants.java
index b9ed4ab..fc7b390 100644
--- a/compiler-common/src/main/java/org/apache/royale/compiler/mxml/IMXMLTypeConstants.java
+++ b/compiler-common/src/main/java/org/apache/royale/compiler/mxml/IMXMLTypeConstants.java

@@ -49,7 +49,7 @@
     static final String EffectManager = "mx.effects.EffectManager";
     static final String FlexGlobals = "mx.core.FlexGlobals";
     static final String FlexModuleFactory = "mx.core.FlexModuleFactory";
-    static final String RoyaleVersion = "mx.core.RoyaleVersion";
+    static final String FlexVersion = "mx.core.FlexVersion";
     static final String GroupBase = "spark.components.supportClasses.GroupBase";
     static final String HTTPService = "mx.rpc.http.mxml.HTTPService";
     static final String HaloApplication = "mx.core.Application";

diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
index a7a3846..7fbb8f6 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java

@@ -236,7 +236,7 @@
         
         final String compatibilityVersion = royaleProject.getCompatibilityVersionString();
         if (compatibilityVersion != null)
-            resolveReferenceToCompilationUnit(delegate.royaleVersionReference,
+            resolveReferenceToCompilationUnit(delegate.flexVersionReference,
                     projectScope,
                     compilationUnits,
                     problems);
@@ -854,7 +854,7 @@
             getClassByAliasReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IASLanguageConstants.getClassByAlias);
             registerClassAliasReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IASLanguageConstants.registerClassAlias);
             crossDomainRSLItemReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IMXMLTypeConstants.CrossDomainRSLItem);
-            royaleVersionReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IMXMLTypeConstants.RoyaleVersion);
+            flexVersionReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IMXMLTypeConstants.FlexVersion);
             capabilitiesReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IASLanguageConstants.Capabilities);
             textFieldFactoryReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IMXMLTypeConstants.TextFieldFactory);
             iSWFContextReference = ReferenceFactory.packageQualifiedReference(project.getWorkspace(), IMXMLTypeConstants.ISWFContext);
@@ -874,7 +874,7 @@
         private final IResolvedQualifiersReference getClassByAliasReference;
         private final IResolvedQualifiersReference registerClassAliasReference;
         private final IResolvedQualifiersReference crossDomainRSLItemReference;
-        private final IResolvedQualifiersReference royaleVersionReference;
+        private final IResolvedQualifiersReference flexVersionReference;
         private final IResolvedQualifiersReference capabilitiesReference;
         private final IResolvedQualifiersReference textFieldFactoryReference;
         private final IResolvedQualifiersReference iSWFContextReference;
@@ -1810,15 +1810,15 @@
             // Generate code for the constructor:
             // public function ClassName()
             // {
-            //    RoyaleVersion.compatibilityVersionString = "4.5.0";
+            //    FlexVersion.compatibilityVersionString = "4.5.0";
             //    super();
             // }
             final String compatibilityVersion = royaleProject.getCompatibilityVersionString();
             final InstructionList classITraitsInit = new InstructionList();
-            if (compatibilityVersion != null && royaleVersionReference.resolve(royaleProject) != null && isFlexSDKInfo)
+            if (compatibilityVersion != null && flexVersionReference.resolve(royaleProject) != null && isFlexSDKInfo)
             {
-                Name royaleVersionSlotName = royaleVersionReference.getMName();
-                classITraitsInit.addInstruction(ABCConstants.OP_getlex, royaleVersionSlotName);
+                Name flexVersionSlotName = flexVersionReference.getMName();
+                classITraitsInit.addInstruction(ABCConstants.OP_getlex, flexVersionSlotName);
                 classITraitsInit.addInstruction(ABCConstants.OP_pushstring, compatibilityVersion);
                 classITraitsInit.addInstruction(ABCConstants.OP_setproperty, new Name("compatibilityVersionString"));
             }