This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new c2137debb IMXMLTypeConstants: mx.core.FlexVersion should not have been
converted to mx.core.RoyaleVersion
c2137debb is described below
commit c2137debbad7180098ec1a1fea42f9796774a97b
Author: Josh Tynjala <[email protected]>
AuthorDate: Tue Jun 16 14:31:19 2026 -0700
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
---
.../org/apache/royale/compiler/config/Configuration.java | 2 +-
.../apache/royale/compiler/mxml/IMXMLTypeConstants.java | 2 +-
.../compiler/internal/targets/RoyaleAppSWFTarget.java | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
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 178a82dcd..ba5ac2e3c 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 @@ public class Configuration
}
/*
- * 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 b9ed4ab4d..fc7b39041 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 @@ public interface IMXMLTypeConstants
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 a7a384627..7fbb8f6ef 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 @@ public class RoyaleAppSWFTarget extends AppSWFTarget
final String compatibilityVersion =
royaleProject.getCompatibilityVersionString();
if (compatibilityVersion != null)
- resolveReferenceToCompilationUnit(delegate.royaleVersionReference,
+ resolveReferenceToCompilationUnit(delegate.flexVersionReference,
projectScope,
compilationUnits,
problems);
@@ -854,7 +854,7 @@ public class RoyaleAppSWFTarget extends AppSWFTarget
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 @@ public class RoyaleAppSWFTarget extends AppSWFTarget
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 @@ public class RoyaleAppSWFTarget extends AppSWFTarget
// 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"));
}
