Updated swf-major and swf-minor check/updates based on latest changes (…

…#869)
Moonshine-IDE · Jun 28, 2021 · bc9e6e4 · bc9e6e4
1 parent e18a04a
commit bc9e6e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/ide/MoonshineDESKTOPevolved/src/actionScripts/plugins/as3project/CreateProject.as b/ide/MoonshineDESKTOPevolved/src/actionScripts/plugins/as3project/CreateProject.as
@@ -749,7 +749,7 @@ package actionScripts.plugins.as3project
 			// lets load the target flash/air player version
 			// since swf and air player both versioning same now,
 			// we can load anyone's config file
-            var movieVersion:String = SDKUtils.getSdkSwfMajorVersion().toString()+".0";
+            var movieVersion:String = SDKUtils.getSdkSwfFullVersion().toString();
 
 			// Create project root directory
 			if (!isProjectFromExistingSource)

diff --git a/...shineDESKTOPevolved/src/actionScripts/plugins/as3project/importer/FlashBuilderImporter.as b/...shineDESKTOPevolved/src/actionScripts/plugins/as3project/importer/FlashBuilderImporter.as
@@ -26,7 +26,7 @@ package actionScripts.plugins.as3project.importer
     import actionScripts.plugin.core.importer.FlashBuilderImporterBase;
     import actionScripts.utils.SDKUtils;
     import actionScripts.utils.SerializeUtil;
-    import actionScripts.utils.UtilsCore;
+    import actionScripts.utils.UtilsCore;
 
 	public class FlashBuilderImporter extends FlashBuilderImporterBase
 	{
@@ -167,6 +167,7 @@ package actionScripts.plugins.as3project.importer
 			p.swfOutput.path = outputFolder.resolvePath(p.targets[0].fileBridge.name.split(".")[0] + ".swf");
 			// lets update SWF version too per current SDK version (if setup a default SDK)
 			p.swfOutput.swfVersion = SDKUtils.getSdkSwfMajorVersion(p.buildOptions.customSDKPath);
+			p.swfOutput.swfMinorVersion = SDKUtils.getSdkSwfMinorVersion(p.buildOptions.customSDKPath);
 
 			p.classpaths.push(sourceFolder);
 			p.isFlashBuilderProject = true;

diff --git a/ide/MoonshineSharedCore/src/actionScripts/plugin/actionscript/as3project/vo/AS3ProjectVO.as b/ide/MoonshineSharedCore/src/actionScripts/plugin/actionscript/as3project/vo/AS3ProjectVO.as
@@ -168,6 +168,7 @@ package actionScripts.plugin.actionscript.as3project.vo
 			}
 			buildOptions.customSDKPath = value;
 			swfOutput.swfVersion = SDKUtils.getSdkSwfMajorVersion(value);
+			swfOutput.swfMinorVersion = SDKUtils.getSdkSwfMinorVersion(value);
 			this.dispatchEvent(new Event(CHANGE_CUSTOM_SDK));
 		}
 

diff --git a/ide/MoonshineSharedCore/src/actionScripts/plugin/actionscript/as3project/vo/MXMLCConfigVO.as b/ide/MoonshineSharedCore/src/actionScripts/plugin/actionscript/as3project/vo/MXMLCConfigVO.as
@@ -227,11 +227,13 @@ package actionScripts.plugin.actionscript.as3project.vo
 			if (!pvo.buildOptions.customSDK && IDEModel.getInstance().defaultSDK)
 			{
 				pvo.swfOutput.swfVersion = SDKUtils.getSdkSwfMajorVersion();
+				pvo.swfOutput.swfMinorVersion = SDKUtils.getSdkSwfMinorVersion();
 				sdkPath = IDEModel.getInstance().defaultSDK.fileBridge.nativePath;
 			}
 			else if (pvo.buildOptions.customSDK)
 			{
 				pvo.swfOutput.swfVersion = SDKUtils.getSdkSwfMajorVersion(pvo.buildOptions.customSDKPath);
+				pvo.swfOutput.swfMinorVersion = SDKUtils.getSdkSwfMinorVersion(pvo.buildOptions.customSDKPath);
 				sdkPath = pvo.buildOptions.customSDKPath;
 			}
 
@@ -272,7 +274,7 @@ package actionScripts.plugin.actionscript.as3project.vo
             }
 
 			data.appendChild(
-				<target-player>{pvo.swfOutput.swfVersion}</target-player>
+				<target-player>{pvo.swfOutput.swfVersion}.{pvo.swfOutput.swfMinorVersion}</target-player>
 			);
 			data.appendChild(
 				<output>{pvo.swfOutput.path.fileBridge.nativePath}</output>