Skip to content

Commit 6204cb0

Browse files
tuaruatuarua
committed
2.13.0
1 parent 5e871ca commit 6204cb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+201
-233
lines changed

Diff for: ‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
### 2.13.0
22
- WIN/macOS: Issue #264
3+
- AND: Updated to FreKotlin 1.41.0
4+
- iOS/macOS: Updated to FreSwift 5.0.0
35

46
### 2.12.0
57
- AND: Updated to FreKotlin 1.40.0

Diff for: ‎example-mobile/android_dependencies/.gitignore renamed to ‎example-desktop-as3/extensions/.gitignore

File renamed without changes.

Diff for: ‎example-desktop-complete/.actionScriptProperties

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<actionScriptProperties analytics="false" mainApplicationPath="WebViewANESample.as" projectUUID="e00d7003-2d79-43ea-b33f-f1963b774945" version="11">
2+
<actionScriptProperties analytics="false" mainApplicationPath="Main.as" projectUUID="e00d7003-2d79-43ea-b33f-f1963b774945" version="11">
33
<compiler additionalCompilerArguments="-locale en_US" advancedTelemetry="false" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" useFlashSDK="true" verifyDigests="true" warn="true">
44
<compilerSourcePath/>
55
<libraryPath defaultLinkType="0">
@@ -31,14 +31,14 @@
3131
</excludedEntries>
3232
</libraryPathEntry>
3333
<libraryPathEntry kind="1" linkType="1" path="libs"/>
34-
<libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/WebViewANE/native_extension/ane/WebViewANE.ane"/>
35-
<libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/WebViewANE/native_extension/ane/FreSwift.ane"/>
36-
<libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/WebViewANE/native_extension/ane/FreSharp.ane"/>
34+
<libraryPathEntry kind="5" linkType="2" path="extensions/WebViewANE.ane"/>
35+
<libraryPathEntry kind="5" linkType="2" path="extensions/FreSwift.ane"/>
36+
<libraryPathEntry kind="5" linkType="2" path="extensions/FreSharp.ane"/>
3737
</libraryPath>
3838
<sourceAttachmentPath/>
3939
</compiler>
4040
<applications>
41-
<application path="WebViewANESample.as">
41+
<application path="Main.as">
4242
<airExcludes/>
4343
</application>
4444
</applications>
@@ -51,9 +51,9 @@
5151
<airSettings airCertificatePath="D:/dev/flash5/tuaruaWin.p12" airTimestamp="true" anePathSet="true" version="1">
5252
<airExcludes/>
5353
<anePaths>
54-
<anePathEntry path="${DOCUMENTS}/WebViewANE/native_extension/ane/WebViewANE.ane"/>
55-
<anePathEntry path="${DOCUMENTS}/WebViewANE/native_extension/ane/FreSwift.ane"/>
56-
<anePathEntry path="${DOCUMENTS}/WebViewANE/native_extension/ane/FreSharp.ane"/>
54+
<anePathEntry path="extensions/WebViewANE.ane"/>
55+
<anePathEntry path="extensions/FreSwift.ane"/>
56+
<anePathEntry path="extensions/FreSharp.ane"/>
5757
</anePaths>
5858
<newLaunchParams/>
5959
<modifiedLaunchParams/>

Diff for: ‎example-desktop-complete/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,5 @@ fabric.properties
7777
# *.iml
7878
# modules.xml
7979
# .idea/misc.xml
80-
# *.ipr
80+
# *.ipr
81+
/air_package.resolved.json

Diff for: ‎example-desktop-complete/.idea/libraries/FreSharp.xml

-9
This file was deleted.

Diff for: ‎example-desktop-complete/.idea/libraries/FreSwift.xml

-9
This file was deleted.

Diff for: ‎example-desktop-complete/.idea/libraries/WebViewANE.xml renamed to ‎example-desktop-complete/.idea/libraries/extensions.xml

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎example-desktop-complete/.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎example-desktop-complete/.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>WebViewANESample</name>
3+
<name>Main</name>
44
<comment></comment>
55
<projects>
66
<project>WebViewANE</project>

Diff for: ‎example-desktop-complete/WebViewANESample.iml

+7-18
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,19 @@
22
<module type="Flex" version="4">
33
<component name="FlexBuildConfigurationManager" active="WebView ANE Sample">
44
<configurations>
5-
<configuration name="WebView ANE Sample" target-platform="Desktop" pure-as="true" main-class="WebViewANESample" output-file="WebViewANESample.swf" output-folder="$MODULE_DIR$/bin-release">
5+
<configuration name="WebView ANE Sample" target-platform="Desktop" pure-as="true" main-class="Main" output-file="WebViewANESample.swf" output-folder="$MODULE_DIR$/bin-release">
66
<dependencies>
77
<entries>
88
<entry library-name="FiraSansSemiBold" library-level="project">
99
<dependency linkage="Merged" />
1010
</entry>
11-
<entry library-name="WebViewANE" library-level="project">
12-
<dependency linkage="Merged" />
13-
</entry>
1411
<entry library-name="WebViewIcons" library-level="project">
1512
<dependency linkage="Merged" />
1613
</entry>
1714
<entry library-name="greensock" library-level="project">
1815
<dependency linkage="Merged" />
1916
</entry>
20-
<entry library-name="FreSwift" library-level="project">
21-
<dependency linkage="Merged" />
22-
</entry>
23-
<entry library-name="FreSharp" library-level="project">
17+
<entry library-name="extensions" library-level="project">
2418
<dependency linkage="Merged" />
2519
</entry>
2620
</entries>
@@ -33,7 +27,7 @@
3327
</map>
3428
<option name="additionalOptions" value="-swf-version=43" />
3529
</compiler-options>
36-
<packaging-air-desktop use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/WebViewANESample-app.xml" package-file-name="WebViewANESample">
30+
<packaging-air-desktop use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="WebViewANESample">
3731
<files-to-package>
3832
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/jsTest.html" path-in-package="jsTest.html" />
3933
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/localTest.html" path-in-package="localTest.html" />
@@ -42,25 +36,19 @@
4236
<packaging-android />
4337
<packaging-ios />
4438
</configuration>
45-
<configuration name="webView ANE Sample 64bit" target-platform="Desktop" pure-as="true" main-class="WebViewANESample" output-file="webView_ANE_Sample_64bit.swf" output-folder="$MODULE_DIR$/bin-debug">
39+
<configuration name="webView ANE Sample 64bit" target-platform="Desktop" pure-as="true" main-class="Main" output-file="webView_ANE_Sample_64bit.swf" output-folder="$MODULE_DIR$/bin-debug">
4640
<dependencies>
4741
<entries>
4842
<entry library-name="FiraSansSemiBold" library-level="project">
4943
<dependency linkage="Merged" />
5044
</entry>
51-
<entry library-name="WebViewANE" library-level="project">
52-
<dependency linkage="Merged" />
53-
</entry>
5445
<entry library-name="WebViewIcons" library-level="project">
5546
<dependency linkage="Merged" />
5647
</entry>
5748
<entry library-name="greensock" library-level="project">
5849
<dependency linkage="Merged" />
5950
</entry>
60-
<entry library-name="FreSwift" library-level="project">
61-
<dependency linkage="Merged" />
62-
</entry>
63-
<entry library-name="FreSharp" library-level="project">
51+
<entry library-name="extensions" library-level="project">
6452
<dependency linkage="Merged" />
6553
</entry>
6654
</entries>
@@ -73,7 +61,7 @@
7361
</map>
7462
<option name="additionalOptions" value="-swf-version=43" />
7563
</compiler-options>
76-
<packaging-air-desktop use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/WebViewANESample-app-64.xml" package-file-name="webView_ANE_Sample_64bit">
64+
<packaging-air-desktop use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app-64.xml" package-file-name="webView_ANE_Sample_64bit">
7765
<files-to-package>
7866
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/jsTest.html" path-in-package="jsTest.html" />
7967
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/localTest.html" path-in-package="localTest.html" />
@@ -103,5 +91,6 @@
10391
<orderEntry type="library" exported="" name="FreSharpANE" level="project" />
10492
<orderEntry type="library" exported="" name="FreSharp" level="project" />
10593
<orderEntry type="library" exported="" name="WebViewANE" level="project" />
94+
<orderEntry type="library" exported="" name="extensions" level="project" />
10695
</component>
10796
</module>

Diff for: ‎example-desktop-complete/air_package.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "webview-sample",
3+
"version": "2.13.0",
4+
"appDescriptor": "src/Main-app.xml",
5+
"variables": {
6+
},
7+
"airDotPrefix": true,
8+
"appleTeamId": "XXXXXX",
9+
"repository": {
10+
"url": "https://tuarua.github.io/air/air_packages.json"
11+
},
12+
"dependencies": {
13+
"com.tuarua.WebViewANE": "2.13.0",
14+
"com.tuarua.FreSharp": "2.4.0",
15+
"com.tuarua.FreSwift": "5.0.0"
16+
}
17+
}

Diff for: ‎example-desktop-complete/extensions/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.ane
2+

Diff for: ‎example-desktop-complete/src/WebViewANESample-app-64.xml renamed to ‎example-desktop-complete/src/Main-app-64.xml

File renamed without changes.

Diff for: ‎example-desktop-complete/src/WebViewANESample-app.xml renamed to ‎example-desktop-complete/src/Main-app.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuaura.WebViewANESample</id>
44
<filename>WebViewANESample</filename>
55
<name>webView</name>
6-
<versionNumber>2.12.0</versionNumber>
6+
<versionNumber>2.13.0</versionNumber>
77
<initialWindow>
88
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
99
<title>WebViewANE Example</title>

Diff for: ‎example-desktop-complete/src/WebViewANESample.as renamed to ‎example-desktop-complete/src/Main.as

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import views.StatusText;
6161
import views.TabBar;
6262

6363
[SWF(width="1280", height="800", frameRate="60", backgroundColor="#F1F1F1")]
64-
public class WebViewANESample extends Sprite {
64+
public class Main extends Sprite {
6565
public static const FONT:Font = new FiraSansSemiBold();
6666
private var freSharpANE:FreSharp = new FreSharp(); // must create before all others
6767
private var freSwiftANE:FreSwift = new FreSwift(); // must create before all others
@@ -94,7 +94,7 @@ public class WebViewANESample extends Sprite {
9494
private static const newTabUrls:Vector.<String> = new <String>["https://www.bing.com", "https://www.bbc.co.uk",
9595
null, "https://www.github.com", "https://forum.starling-framework.org/"];
9696

97-
public function WebViewANESample() {
97+
public function Main() {
9898
super();
9999
stage.align = StageAlign.TOP_LEFT;
100100
stage.scaleMode = StageScaleMode.NO_SCALE;

Diff for: ‎example-desktop-complete/src/views/BasicButton.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BasicButton extends SimpleButton {
2929
lbl.antiAliasType = AntiAliasType.ADVANCED;
3030
lbl.sharpness = -100;
3131

32-
var tf:TextFormat = new TextFormat(WebViewANESample.FONT.fontName, 13, 0xFFFFFF);
32+
var tf:TextFormat = new TextFormat(Main.FONT.fontName, 13, 0xFFFFFF);
3333
tf.align = "center";
3434
tf.bold = false;
3535
lbl.defaultTextFormat = tf;

Diff for: ‎example-desktop-complete/src/views/Input.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Input extends Sprite {
3030
this.graphics.endFill();
3131

3232
var textFormat:TextFormat = new TextFormat();
33-
textFormat.font = WebViewANESample.FONT.fontName;
33+
textFormat.font = Main.FONT.fontName;
3434
textFormat.size = 13;
3535
textFormat.align = TextFormatAlign.LEFT;
3636
textFormat.kerning = true;

Diff for: ‎example-desktop-complete/src/views/StatusText.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class StatusText extends TextField {
1313
super();
1414

1515
var textFormat:TextFormat = new TextFormat();
16-
textFormat.font = WebViewANESample.FONT.fontName;
16+
textFormat.font = Main.FONT.fontName;
1717
textFormat.size = 13;
1818
textFormat.align = TextFormatAlign.LEFT;
1919
textFormat.kerning = true;

Diff for: ‎example-desktop-complete/src/views/Tab.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class Tab extends Sprite {
4545

4646

4747
var textFormat:TextFormat = new TextFormat();
48-
textFormat.font = WebViewANESample.FONT.fontName;
48+
textFormat.font = Main.FONT.fontName;
4949
textFormat.size = 11;
5050
textFormat.align = TextFormatAlign.LEFT;
5151
textFormat.kerning = true;

Diff for: ‎example-desktop-flex/extensions/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.ane
2+

Diff for: ‎example-mobile/.idea/libraries/android_dependencies.xml

-10
This file was deleted.

Diff for: ‎example-mobile/.idea/libraries/WebViewANE.xml renamed to ‎example-mobile/.idea/libraries/extensions.xml

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)