Skip to content

Commit 1619b4b

Browse files
tuaruatuarua
authored
Merge pull request #307 from tuarua/development
Development
2 parents d5693a6 + 14071c2 commit 1619b4b

Some content is hidden

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

50 files changed

+128
-120
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### 2.28.0
2+
- iOS/macOS: Updated to FreSwift 5.7.2
3+
- AND: Updated to FreKotlin 1.72.1
4+
- WIN: Updated to CefSharp 108.4.13
5+
- WIN: updated Json.NET to 13.0.2
6+
- WIN: DownloadProgress.percent int value
7+
18
### 2.27.0
29
- WIN: Updated to CefSharp 106.0.29
310

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# WebViewANE
22

3-
WebView Adobe Air Native Extension for macOS 10.10+, Windows Desktop, iOS 9.0+ and Android19+.
3+
WebView Adobe Air Native Extension for macOS 10.13+, Windows Desktop, iOS 11.0+ and Android19+.
44
This ANE provides access to a more modern webview from AIR.
55

66
-------------

‎example-desktop-as3/air_package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.27.0",
3+
"version": "2.28.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.27.0",
13+
"com.tuarua.WebViewANE": "2.28.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.2"
15+
"com.tuarua.FreSwift": "5.7.2"
1616
}
1717
}

‎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.

‎example-desktop-complete/WebViewANESample.iml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency linkage="Merged" />
1919
</entry>
2020
</entries>
21-
<sdk name="AIRSDK_33.1.1.713" />
21+
<sdk name="AIRSDK_50.1.1" />
2222
</dependencies>
2323
<compiler-options>
2424
<map>
@@ -52,7 +52,7 @@
5252
<dependency linkage="Merged" />
5353
</entry>
5454
</entries>
55-
<sdk name="AIRSDK_33.1.1.713" />
55+
<sdk name="AIRSDK_50.1.1" />
5656
</dependencies>
5757
<compiler-options>
5858
<map>
@@ -78,7 +78,7 @@
7878
<content url="file://$MODULE_DIR$">
7979
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
8080
</content>
81-
<orderEntry type="jdk" jdkName="AIRSDK_33.1.1.713" jdkType="Flex SDK Type (new)" />
81+
<orderEntry type="jdk" jdkName="AIRSDK_50.1.1" jdkType="Flex SDK Type (new)" />
8282
<orderEntry type="sourceFolder" forTests="false" />
8383
<orderEntry type="library" exported="" name="starling" level="project" />
8484
<orderEntry type="library" exported="" name="DesktopToastANE" level="project" />

‎example-desktop-complete/air_package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.27.0",
3+
"version": "2.28.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.27.0",
13+
"com.tuarua.WebViewANE": "2.28.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.2"
15+
"com.tuarua.FreSwift": "5.7.2"
1616
}
1717
}

‎example-desktop-complete/src/Main-app-64.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2-
<application xmlns="http://ns.adobe.com/air/application/33.1">
2+
<application xmlns="http://ns.adobe.com/air/application/50.1">
33
<id>WebViewANESample</id>
44
<architecture>64</architecture>
55
<filename>WebViewANESample</filename>
66
<name>webView</name>
7-
<versionNumber>2.27.0</versionNumber>
7+
<versionNumber>2.28.0</versionNumber>
88
<initialWindow>
99
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
1010
<resizable>false</resizable>

‎example-desktop-complete/src/Main-app.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2-
<application xmlns="http://ns.adobe.com/air/application/33.1">
2+
<application xmlns="http://ns.adobe.com/air/application/50.1">
33
<id>com.tuaura.WebViewANESample</id>
44
<filename>WebViewANESample</filename>
55
<name>webView</name>
6-
<versionNumber>2.27.0</versionNumber>
6+
<versionNumber>2.28.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>

‎example-desktop-flex/air_package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.27.0",
3+
"version": "2.28.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.27.0",
13+
"com.tuarua.WebViewANE": "2.28.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.2"
15+
"com.tuarua.FreSwift": "5.7.2"
1616
}
1717
}

‎example-mobile/.idea/misc.xml

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

‎example-mobile/.idea/runConfigurations/iOS___simulator.xml

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

‎example-mobile/WebViewANESample-mobile.iml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency linkage="Merged" />
1616
</entry>
1717
</entries>
18-
<sdk name="AIRSDK_33.1.1.713" />
18+
<sdk name="AIRSDK_50.1.1" />
1919
</dependencies>
2020
<compiler-options>
2121
<map>
@@ -52,7 +52,7 @@
5252
<dependency linkage="Merged" />
5353
</entry>
5454
</entries>
55-
<sdk name="AIRSDK_33.1.1.713" />
55+
<sdk name="AIRSDK_50.1.1" />
5656
</dependencies>
5757
<compiler-options>
5858
<map>
@@ -73,7 +73,7 @@
7373
<FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/device" path-in-package="." />
7474
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
7575
</files-to-package>
76-
<AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
76+
<AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2023/iOS/dev/tua_rua_dev_2023.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2023/iOS/dev/2023_iOS_Provisioning.mobileprovision" />
7777
</packaging-ios>
7878
</configuration>
7979
<configuration name="WebViewANESample-mobile Android Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="WebViewANESample-mobile_Android_Device.swf" output-folder="$MODULE_DIR$/bin-release/device">
@@ -89,7 +89,7 @@
8989
<dependency linkage="Merged" />
9090
</entry>
9191
</entries>
92-
<sdk name="AIRSDK_33.1.1.713" />
92+
<sdk name="AIRSDK_50.1.1" />
9393
</dependencies>
9494
<compiler-options>
9595
<map>
@@ -128,7 +128,7 @@
128128
<dependency linkage="Merged" />
129129
</entry>
130130
</entries>
131-
<sdk name="AIRSDK_33.1.1.713" />
131+
<sdk name="AIRSDK_50.1.1" />
132132
</dependencies>
133133
<compiler-options>
134134
<map>
@@ -162,7 +162,7 @@
162162
<sourceFolder url="file://$MODULE_DIR$/system" isTestSource="false" />
163163
<sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
164164
</content>
165-
<orderEntry type="jdk" jdkName="AIRSDK_33.1.1.713" jdkType="Flex SDK Type (new)" />
165+
<orderEntry type="jdk" jdkName="AIRSDK_50.1.1" jdkType="Flex SDK Type (new)" />
166166
<orderEntry type="sourceFolder" forTests="false" />
167167
<orderEntry type="library" exported="" name="WebViewANE-ios" level="project" />
168168
<orderEntry type="library" exported="" name="SwiftIOSANE-ios" level="project" />

‎example-mobile/air_package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.27.0",
3+
"version": "2.28.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,10 +10,10 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.27.0",
13+
"com.tuarua.WebViewANE": "2.28.0",
1414
"com.google.code.gson.gson": "2.8.6",
15-
"com.tuarua.frekotlin": "1.42.0",
16-
"com.tuarua.iOS.FreSwift": "5.5.2",
17-
"com.tuarua.WebViewANE.IosDependencies": "2.27.0"
15+
"com.tuarua.frekotlin": "1.72.1",
16+
"com.tuarua.iOS.FreSwift": "5.7.2",
17+
"com.tuarua.WebViewANE.IosDependencies": "2.28.0"
1818
}
1919
}

‎example-mobile/src/Main-app.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2-
<application xmlns="http://ns.adobe.com/air/application/33.1">
2+
<application xmlns="http://ns.adobe.com/air/application/50.1">
33

44
<id>com.eoinlandy.webview</id> <!-- Bundle Identifier. Required. -->
55
<filename>WebViewANESampleMobile</filename> <!-- Used as the filename for the application. Required. -->
66
<name>WebViewANESampleMobile</name> <!-- The name that is displayed below the app icon. -->
7-
<versionNumber>2.27.0</versionNumber> <!-- Required. -->
7+
<versionNumber>2.28.0</versionNumber> <!-- Required. -->
88

99
<!-- Settings for the application's initial window. Required. -->
1010
<initialWindow>
@@ -57,7 +57,7 @@
5757
<manifestAdditions>
5858
<![CDATA[
5959
<manifest android:installLocation="auto">
60-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
60+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
6161
<uses-permission android:name="android.permission.INTERNET"/>
6262
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
6363
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -92,7 +92,7 @@
9292
<string>2</string>
9393
</array>
9494
<key>MinimumOSVersion</key>
95-
<string>9.0</string>
95+
<string>11.0</string>
9696
<key>NSAppTransportSecurity</key>
9797
<dict>
9898
<key>NSAllowsArbitraryLoads</key>

‎mac_installer/sign_developerId.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ $PlistBuddy -c "Add :CFBundleIconFile string AppIcon" $APP.app/Contents/Info.pli
112112
$PlistBuddy -c "Add :CFBundleSupportedPlatforms array" $APP.app/Contents/Info.plist
113113
$PlistBuddy -c "Add :CFBundleSupportedPlatforms: string MacOSX" $APP.app/Contents/Info.plist
114114
# Swift requires 10.10 not AIR's 10.6
115-
$PlistBuddy -c "Set :LSMinimumSystemVersion 10.10" $APP.app/Contents/Info.plist
115+
$PlistBuddy -c "Set :LSMinimumSystemVersion 10.13" $APP.app/Contents/Info.plist
116116

117117
if [ -d "$APP.app/Contents/Resources/META-INF/AIR/extensions" ]; then
118118
pushd $pathtome > /dev/null 2>&1

‎mac_installer/sign_store.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ $PlistBuddy -c "Add :CFBundleIconFile string AppIcon" $APP.app/Contents/Info.pli
115115
$PlistBuddy -c "Add :CFBundleSupportedPlatforms array" $APP.app/Contents/Info.plist
116116
$PlistBuddy -c "Add :CFBundleSupportedPlatforms: string MacOSX" $APP.app/Contents/Info.plist
117117
# Swift requires 10.10 not AIR's 10.6
118-
$PlistBuddy -c "Set :LSMinimumSystemVersion 10.10" $APP.app/Contents/Info.plist
118+
$PlistBuddy -c "Set :LSMinimumSystemVersion 10.13" $APP.app/Contents/Info.plist
119119

120120
if [ -d "$APP.app/Contents/Resources/META-INF/AIR/extensions" ]; then
121121
pushd $pathtome > /dev/null 2>&1

‎native_extension/.idea/misc.xml

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

‎native_extension/WebViewANE.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<configurations>
55
<configuration name="WebViewANE" target-platform="Desktop" pure-as="true" output-type="Library" output-file="WebViewANE.swc" output-folder="$MODULE_DIR$/bin">
66
<dependencies>
7-
<sdk name="AIRSDK_32" />
7+
<sdk name="AIRSDK_50.1.1" />
88
</dependencies>
99
<compiler-options>
1010
<map>
@@ -24,7 +24,7 @@
2424
<content url="file://$MODULE_DIR$">
2525
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
2626
</content>
27-
<orderEntry type="jdk" jdkName="AIRSDK_32" jdkType="Flex SDK Type (new)" />
27+
<orderEntry type="jdk" jdkName="AIRSDK_50.1.1" jdkType="Flex SDK Type (new)" />
2828
<orderEntry type="sourceFolder" forTests="false" />
2929
</component>
3030
</module>

‎native_extension/ane/air_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.tuarua.WebViewANE",
3-
"version": "2.27.0",
3+
"version": "2.28.0",
44
"repository": {
55
"url": "https://tuarua.github.io/air/air_packages.json"
66
},

‎native_extension/ane/build-windows.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
REM Get the path to the script and trim to get the directory.
22
@echo off
33
SET SZIP="C:\Program Files\7-Zip\7z.exe"
4-
SET AIR_PATH="D:\dev\sdks\AIR\AIRSDK_32\bin\"
4+
SET AIR_PATH="D:\dev\sdks\AIR\AIRSDK_50.1.1\bin\"
55

66
echo Setting path to current directory to:
77
SET pathtome=%~dp0

‎native_extension/ane/build_multi.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PROJECTNAME=WebViewANE
88
fwSuffix="_FW"
99
libSuffix="_LIB"
1010

11-
AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.713"
11+
AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_50.1.1"
1212

1313
if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then
1414
echo "No Simulator build. Build using Xcode"

‎native_extension/ane/extension_multi.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuarua.WebViewANE</id>
44
<name>WebView ANE</name>
55
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
6-
<versionNumber>2.27.0</versionNumber>
6+
<versionNumber>2.28.0</versionNumber>
77
<platforms>
88
<platform name="iPhone-x86">
99
<applicationDeployment>

‎native_extension/ane/extension_win.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuarua.WebViewANE</id>
44
<name>WebView ANE</name>
55
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
6-
<versionNumber>2.27.0</versionNumber>
6+
<versionNumber>2.28.0</versionNumber>
77
<platforms>
88
<platform name="Windows-x86">
99
<applicationDeployment>

‎native_extension/ane/platforms/ios/platform-sim.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
3-
<sdkVersion>15.2</sdkVersion>
3+
<sdkVersion>16.2</sdkVersion>
44
<linkerOptions>
55
<option>-w</option>
66
<option>-ObjC</option>

‎native_extension/ane/platforms/ios/platform.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
3-
<sdkVersion>15.2</sdkVersion>
3+
<sdkVersion>16.2</sdkVersion>
44
<linkerOptions>
5-
<option>-ios_version_min 9.0</option>
5+
<option>-ios_version_min 11.0</option>
66
<option>-w</option>
77
<option>-ObjC</option>
88
<option>-rpath @executable_path/Frameworks</option>

‎native_extension/ane/platforms/win/x64/release/Newtonsoft.Json.dll

9.73 KB
Binary file not shown.

‎native_extension/ane/platforms/win/x64/release/WebViewANE.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x64/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x64/release/library.swf

28 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/Newtonsoft.Json.dll

9.73 KB
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/WebViewANE.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/library.swf

28 Bytes
Binary file not shown.

‎native_extension/bin/WebViewANE.swc

23 Bytes
Binary file not shown.

‎native_extension/src/com/tuarua/webview/DownloadProgress.as

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class DownloadProgress extends Object {
3333
/**
3434
* Returns the rough percent complete or -1 if the receive total size is unknown.
3535
*/
36-
public var percent:uint = 0;
36+
public var percent:int = 0;
3737
/**
3838
* Returns the number of received bytes.
3939
*/

0 commit comments

Comments
 (0)