Skip to content

Commit 3bf0e7f

Browse files
MeychiMeychi
committed
FP and SDK updates...
1 parent 69b9ae1 commit 3bf0e7f

5 files changed

Lines changed: 36 additions & 34 deletions

File tree

‎External/Plugins/AirProperties/Managers/PropertyManager.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PropertyManager
2020
private static AirVersion _version;
2121
private static Boolean _unsupportedVersion;
2222
private const String _BaseAirNamespace = "http://ns.adobe.com/air/application/";
23-
private const String _MaxSupportedVersion = "3.9";
23+
private const String _MaxSupportedVersion = "4.0";
2424

2525
public enum AirVersion
2626
{
@@ -41,7 +41,8 @@ public enum AirVersion
4141
V36 = 15, // Version 3.6
4242
V37 = 16, // Version 3.7
4343
V38 = 17, // Version 3.8
44-
V39 = 18 // Version 3.9
44+
V39 = 18, // Version 3.9
45+
V40 = 19 // Version 4.0
4546
}
4647

4748
public static Exception LastException
@@ -113,11 +114,12 @@ public static Boolean InitializeProperties(string filePath)
113114
else if (nsuri.StartsWith(_BaseAirNamespace + "3.7")) _version = AirVersion.V37;
114115
else if (nsuri.StartsWith(_BaseAirNamespace + "3.8")) _version = AirVersion.V38;
115116
else if (nsuri.StartsWith(_BaseAirNamespace + "3.9")) _version = AirVersion.V39;
117+
else if (nsuri.StartsWith(_BaseAirNamespace + "4.0")) _version = AirVersion.V40;
116118
else
117119
{
118120
// Is a valid AIR descriptor, but version not supported so default to max supported version
119121
_unsupportedVersion = true;
120-
_version = AirVersion.V39;
122+
_version = AirVersion.V40;
121123
}
122124
}
123125
_namespaceManager = new XmlNamespaceManager(_descriptorFile.NameTable);

‎External/Plugins/ProjectManager/Projects/AS3/AS3MovieOptions.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public override string[] TargetVersions(string platform)
3232
switch (platform)
3333
{
3434
case CUSTOM_PLATFORM: return new string[] { "0.0" };
35-
case AIR_MOBILE_PLATFORM: return new string[] { "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9" };
36-
case AIR_PLATFORM: return new string[] { "1.5", "2.0", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9" };
37-
default: return new string[] { "9.0", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7", "11.8", "11.9" };
35+
case AIR_MOBILE_PLATFORM: return new string[] { "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0" };
36+
case AIR_PLATFORM: return new string[] { "1.5", "2.0", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0" };
37+
default: return new string[] { "9.0", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7", "11.8", "11.9", "12.0" };
3838
}
3939
}
4040

@@ -43,9 +43,9 @@ public override string DefaultVersion(string platform)
4343
switch (platform)
4444
{
4545
case CUSTOM_PLATFORM: return "0.0";
46-
case AIR_PLATFORM: return "3.9";
47-
case AIR_MOBILE_PLATFORM: return "3.9";
48-
default: return "11.1";
46+
case AIR_PLATFORM: return "4.0";
47+
case AIR_MOBILE_PLATFORM: return "4.0";
48+
default: return "12.0";
4949
}
5050
}
5151

@@ -77,7 +77,7 @@ public string GetSWFVersion(string version)
7777
{
7878
int index = Array.IndexOf(TargetVersions(FLASHPLAYER_PLATFORM), version);
7979
if (index < 0) return null;
80-
string[] versions = new string[] { "9", "10", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22" };
80+
string[] versions = new string[] { "9", "10", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23" };
8181
return versions[index];
8282
}
8383
}

‎External/Plugins/ProjectManager/Projects/Haxe/HaxeMovieOptions.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public override string[] TargetVersions(string platform)
5252
{
5353
switch (platform)
5454
{
55-
case AIR_PLATFORM: return new string[] { "1.5", "2.0", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9" };
56-
case AIR_MOBILE_PLATFORM: return new string[] { "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9" };
57-
case FLASHPLAYER_PLATFORM: return new string[] { "6.0", "7.0", "8.0", "9.0", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7", "11.8", "11.9" };
55+
case AIR_PLATFORM: return new string[] { "1.5", "2.0", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0" };
56+
case AIR_MOBILE_PLATFORM: return new string[] { "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0" };
57+
case FLASHPLAYER_PLATFORM: return new string[] { "6.0", "7.0", "8.0", "9.0", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7", "11.8", "11.9", "12.0" };
5858
case NME_PLATFORM: return new string[] { "3.0" };
5959
default: return new string[] { "1.0" };
6060
}
@@ -64,9 +64,9 @@ public override string DefaultVersion(string platform)
6464
{
6565
switch (platform)
6666
{
67-
case AIR_PLATFORM: return "3.9";
68-
case AIR_MOBILE_PLATFORM: return "3.9";
69-
case FLASHPLAYER_PLATFORM: return "11.1";
67+
case AIR_PLATFORM: return "4.0";
68+
case AIR_MOBILE_PLATFORM: return "4.0";
69+
case FLASHPLAYER_PLATFORM: return "12.0";
7070
case NME_PLATFORM: return "3.0";
7171
default: return "1.0";
7272
}

‎FlashDevelop/Bin/Debug/Tools/flexlibs/frameworks/libs/player/12.0/playerglobal.swc‎

371 KB
Binary file not shown.

‎appman.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,66 +16,66 @@
1616
<Entry>
1717
<Id>flexairsdk</Id>
1818
<Name>Flex + AIR SDK</Name>
19-
<Version>4.6.0+3.9.0</Version>
20-
<Build>23201B+1380</Build>
19+
<Version>4.6.0+4.0.0</Version>
20+
<Build>23201B+1390</Build>
2121
<Desc>Adobe Flex SDK merged with Adobe AIR SDK</Desc>
2222
<Info>http://www.adobe.com/devnet/air.html</Info>
2323
<Group>AS3</Group>
2424
<Urls>
2525
<Url>http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip</Url>
26-
<Url>http://airdownload.adobe.com/air/win/download/3.9/AdobeAIRSDK.zip</Url>
26+
<Url>http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRSDK.zip</Url>
2727
<Url>http://www.flashdevelop.org/appman/frameworks_flexsdk.zip</Url>
2828
</Urls>
2929
</Entry>
3030
<Entry>
3131
<Id>ascsdk</Id>
3232
<Name>AIR SDK + ASC 2.0</Name>
33-
<Version>3.9.0</Version>
34-
<Build>1380</Build>
33+
<Version>4.0.0</Version>
34+
<Build>1390</Build>
3535
<Desc>Adobe AIR SDK with ASC 2.0</Desc>
3636
<Info>http://www.adobe.com/devnet/air.html</Info>
3737
<Group>AS3</Group>
3838
<Urls>
39-
<Url>http://airdownload.adobe.com/air/win/download/3.9/AIRSDK_Compiler.zip</Url>
39+
<Url>http://airdownload.adobe.com/air/win/download/4.0/AIRSDK_Compiler.zip</Url>
4040
<Url>http://www.flashdevelop.org/appman/frameworks_flexsdk.zip</Url>
4141
</Urls>
4242
</Entry>
4343
<Entry>
4444
<Id>flashsa</Id>
4545
<Name>Flash Player (SA)</Name>
46-
<Version>11.9</Version>
47-
<Build>900.170</Build>
46+
<Version>12.0</Version>
47+
<Build>0.44</Build>
4848
<Desc>Standalone debug Flash Player</Desc>
4949
<Group>AS3</Group>
5050
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
5151
<Urls>
52-
<Url>http://download.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.exe</Url>
52+
<Url>http://download.macromedia.com/pub/flashplayer/updaters/12/flashplayer_12_sa_debug.exe</Url>
5353
</Urls>
5454
</Entry>
5555
<Entry>
5656
<Id>flashns</Id>
5757
<Name>Flash Player (NS)</Name>
58-
<Version>11.9</Version>
59-
<Build>900.170</Build>
58+
<Version>12.0</Version>
59+
<Build>0.44</Build>
6060
<Desc>Debug Flash Player plugin for Netscape browsers</Desc>
6161
<Group>AS3</Group>
6262
<Type>Executable</Type>
6363
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
6464
<Urls>
65-
<Url>http://download.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.exe</Url>
65+
<Url>http://download.macromedia.com/pub/flashplayer/updaters/12/flashplayer_12_plugin_debug.exe</Url>
6666
</Urls>
6767
</Entry>
6868
<Entry>
6969
<Id>flashie</Id>
7070
<Name>Flash Player (AX)</Name>
71-
<Version>11.9</Version>
72-
<Build>900.170</Build>
71+
<Version>12.0</Version>
72+
<Build>0.44</Build>
7373
<Desc>Debug Flash Player plugin for Interner Explorer</Desc>
7474
<Group>AS3</Group>
7575
<Type>Executable</Type>
7676
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
7777
<Urls>
78-
<Url>http://download.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_ax_debug.exe</Url>
78+
<Url>http://download.macromedia.com/pub/flashplayer/updaters/12/flashplayer_12_ax_debug.exe</Url>
7979
</Urls>
8080
</Entry>
8181
<Entry>
@@ -94,14 +94,14 @@
9494
<Entry>
9595
<Id>airrt</Id>
9696
<Name>Adobe AIR</Name>
97-
<Version>3.9.0</Version>
98-
<Build>1380</Build>
97+
<Version>4.0.0</Version>
98+
<Build>1390</Build>
9999
<Desc>Adobe AIR for AIR applications installer</Desc>
100100
<Group>AS3</Group>
101101
<Type>Executable</Type>
102102
<Info>http://www.adobe.com/products/air.html</Info>
103103
<Urls>
104-
<Url>http://airdownload.adobe.com/air/win/download/3.9/AdobeAIRInstaller.exe</Url>
104+
<Url>http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRInstaller.exe</Url>
105105
</Urls>
106106
</Entry>
107107
<Entry>

0 commit comments

Comments
 (0)