Skip to content

Commit c79a992

Browse files
committed
Added support for AIR and FP 20...
1 parent 92f02aa commit c79a992

File tree

8 files changed

+15
-7
lines changed

8 files changed

+15
-7
lines changed

External/Plugins/AirProperties/Managers/PropertyManager.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class PropertyManager
1919
private static AirVersion _version;
2020
private static Boolean _unsupportedVersion;
2121
private const String _BaseAirNamespace = "http://ns.adobe.com/air/application/";
22-
private const String _MaxSupportedVersion = "19.0";
22+
private const String _MaxSupportedVersion = "20.0";
2323

2424
public enum AirVersion
2525
{
@@ -48,7 +48,8 @@ public enum AirVersion
4848
V160 = 23, // Version 16.0
4949
V170 = 24, // Version 17.0
5050
V180 = 25, // Version 18.0
51-
V190 = 26 // Version 19.0
51+
V190 = 26, // Version 19.0
52+
V200 = 27 // Version 20.0
5253
}
5354

5455
public static Exception LastException
@@ -128,11 +129,12 @@ public static Boolean InitializeProperties(string filePath)
128129
else if (nsuri.StartsWith(_BaseAirNamespace + "17.0")) _version = AirVersion.V170;
129130
else if (nsuri.StartsWith(_BaseAirNamespace + "18.0")) _version = AirVersion.V180;
130131
else if (nsuri.StartsWith(_BaseAirNamespace + "19.0")) _version = AirVersion.V190;
132+
else if (nsuri.StartsWith(_BaseAirNamespace + "20.0")) _version = AirVersion.V200;
131133
else
132134
{
133135
// Is a valid AIR descriptor, but version not supported so default to max supported version
134136
_unsupportedVersion = true;
135-
_version = AirVersion.V180;
137+
_version = AirVersion.V190;
136138
}
137139
}
138140
_namespaceManager = new XmlNamespaceManager(_descriptorFile.NameTable);

FlashDevelop/Bin/Debug/Settings/Platforms/AS3/air.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
<templates>
2829
<template target="as3" value="160 ActionScript 3 - AIR AS3 Projector" />

FlashDevelop/Bin/Debug/Settings/Platforms/AS3/airmobile.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
<templates>
2829
<template target="as3" value="190 ActionScript 3 - AIR Mobile AS3 App" />

FlashDevelop/Bin/Debug/Settings/Platforms/AS3/flashplayer.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
</platform>

FlashDevelop/Bin/Debug/Settings/Platforms/Haxe/air.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
</platform>

FlashDevelop/Bin/Debug/Settings/Platforms/Haxe/airmobile.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
</platform>

FlashDevelop/Bin/Debug/Settings/Platforms/Haxe/flashplayer.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<version value="17.0" swf-version="28" />
2424
<version value="18.0" swf-version="29" />
2525
<version value="19.0" swf-version="30" />
26+
<version value="20.0" swf-version="31" />
2627
</versions>
2728
</platform>

PluginCore/PluginCore/PlatformData.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public class PlatformData
1919

2020
public static string ResolveFlashPlayerVersion(string lang, string platformName, string version)
2121
{
22-
if (!SupportedLanguages.ContainsKey(lang)) return "17.0";
22+
if (!SupportedLanguages.ContainsKey(lang)) return "19.0";
2323
var platforms = SupportedLanguages[lang.ToLower()].Platforms;
24-
if (!platforms.ContainsKey(FLASHPLAYER_PLATFORM)) return "17.0";
24+
if (!platforms.ContainsKey(FLASHPLAYER_PLATFORM)) return "19.0";
2525
var flashPlatform = platforms[FLASHPLAYER_PLATFORM];
2626
if (platforms.ContainsKey(platformName))
2727
{
@@ -39,9 +39,9 @@ public static string ResolveFlashPlayerVersion(string lang, string platformName,
3939

4040
public static string ResolveSwfVersion(string lang, string platformName, string version)
4141
{
42-
if (!SupportedLanguages.ContainsKey(lang)) return "28";
42+
if (!SupportedLanguages.ContainsKey(lang)) return "30";
4343
var platforms = SupportedLanguages[lang.ToLower()].Platforms;
44-
if (!platforms.ContainsKey(FLASHPLAYER_PLATFORM) || !platforms.ContainsKey(platformName)) return "28";
44+
if (!platforms.ContainsKey(FLASHPLAYER_PLATFORM) || !platforms.ContainsKey(platformName)) return "29";
4545
var platform = platforms[platformName];
4646
foreach (var platformVersion in platform.Versions)
4747
if (platformVersion.Value == version)

0 commit comments

Comments
 (0)