Merge pull request #197 from tuarua/development

2.1.1
tuarua · Jan 5, 2019 · 0c29ab6 · 0c29ab6
2 parents 11d44e7 + 4a2a618
commit 0c29ab6
Show file tree

Hide file tree

Showing 33 changed files with 433 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.1.1
+- OSX: Fix modifier keys not emitting keyboard events Issue #196
+- WIN: Added Windows 7 touch support Issue #194
+
 ### 2.1.0
 - AND: Updated to FreKotlin 1.6.0
 - Upgraded to AIR 32

diff --git a/c_sharp_libs_x64/WebViewANELib.dll b/c_sharp_libs_x64/WebViewANELib.dll
diff --git a/c_sharp_libs_x86/WebViewANELib.dll b/c_sharp_libs_x86/WebViewANELib.dll
diff --git a/example-desktop-complete/get_dependencies.ps1 b/example-desktop-complete/get_dependencies.ps1
@@ -1,4 +1,4 @@
-$AneVersion = "2.1.0"
+$AneVersion = "2.1.1"
 
 $currentDir = (Get-Item -Path ".\" -Verbose).FullName
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

diff --git a/example-desktop-complete/get_dependencies.sh b/example-desktop-complete/get_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="2.1.0"
+AneVersion="2.1.1"
 FreSwiftVersion="3.0.0"
 
 wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/$FreSwiftVersion/FreSwift.ane?raw=true

diff --git a/example-mobile/.gitignore b/example-mobile/.gitignore
@@ -7,7 +7,6 @@ bin-debug/
 bin-release/
 bin-release-temp/
 cache/
-AIRSDK_patch/
 
 *.app
 

diff --git a/example-mobile/AIRSDK_additions/.gitignore → example-mobile/AIRSDK_patch/.gitignore b/example-mobile/AIRSDK_additions/.gitignore → example-mobile/AIRSDK_patch/.gitignore
diff --git a/example-mobile/AIRSDK_additions/README.md → example-mobile/AIRSDK_patch/README.md b/example-mobile/AIRSDK_additions/README.md → example-mobile/AIRSDK_patch/README.md
diff --git a/example-mobile/get_android_dependencies.ps1 b/example-mobile/get_android_dependencies.ps1
@@ -1,4 +1,4 @@
-$AneVersion = "2.1.0"
+$AneVersion = "2.1.1"
 
 $currentDir = (Get-Item -Path ".\" -Verbose).FullName
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

diff --git a/example-mobile/get_android_dependencies.sh b/example-mobile/get_android_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="2.1.0"
+AneVersion="2.1.1"
 
 wget -O android_dependencies/com.tuarua.frekotlin.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin.ane?raw=true
 wget -O ../native_extension/ane/WebViewANE.ane https://github.com/tuarua/WebViewANE/releases/download/$AneVersion/WebViewANE.ane?raw=true
diff --git a/example-mobile/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AneVersion="2.1.0"
+AneVersion="2.1.1"
 FreSwiftVersion="3.0.0"
 
 rm -r ios_dependencies/device

diff --git a/native_extension/ane/extension_android.xml b/native_extension/ane/extension_android.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-    <versionNumber>2.1.0</versionNumber>
+    <versionNumber>2.1.1</versionNumber>
     <platforms>
         <platform name="Android-ARM">
             <applicationDeployment>

diff --git a/native_extension/ane/extension_ios.xml b/native_extension/ane/extension_ios.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-    <versionNumber>2.1.0</versionNumber>
+    <versionNumber>2.1.1</versionNumber>
     <platforms>
         <platform name="iPhone-x86">
             <applicationDeployment>

diff --git a/native_extension/ane/extension_multi.xml b/native_extension/ane/extension_multi.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-    <versionNumber>2.1.0</versionNumber>
+    <versionNumber>2.1.1</versionNumber>
     <platforms>
         <platform name="iPhone-x86">
             <applicationDeployment>

diff --git a/native_extension/ane/extension_osx.xml b/native_extension/ane/extension_osx.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-    <versionNumber>2.1.0</versionNumber>
+    <versionNumber>2.1.1</versionNumber>
     <platforms>
         <platform name="MacOS-x86-64">
             <applicationDeployment>

diff --git a/native_extension/ane/extension_win.xml b/native_extension/ane/extension_win.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
-    <versionNumber>2.1.0</versionNumber>
+    <versionNumber>2.1.1</versionNumber>
     <platforms>
         <platform name="Windows-x86">
             <applicationDeployment>

diff --git a/native_extension/ane/platforms/win/x64/release/WebViewANE.dll b/native_extension/ane/platforms/win/x64/release/WebViewANE.dll
diff --git a/native_extension/ane/platforms/win/x64/release/library.swf b/native_extension/ane/platforms/win/x64/release/library.swf
diff --git a/native_extension/ane/platforms/win/x86/release/WebViewANE.dll b/native_extension/ane/platforms/win/x86/release/WebViewANE.dll
diff --git a/native_extension/ane/platforms/win/x86/release/library.swf b/native_extension/ane/platforms/win/x86/release/library.swf
diff --git a/native_extension/bin/WebViewANE.swc b/native_extension/bin/WebViewANE.swc
diff --git a/native_extension/src/com/tuarua/WebViewANE.as b/native_extension/src/com/tuarua/WebViewANE.as
@@ -236,7 +236,8 @@ public class WebViewANE extends EventDispatcher {
     }
 
     //noinspection ReservedWordAsName
-    override public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void {
+    override public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0,
+                                              useWeakReference:Boolean = false):void {
         super.addEventListener(type, listener, useCapture, priority, useWeakReference);
         if (_isInited && (KeyboardEvent.KEY_UP == type || KeyboardEvent.KEY_DOWN == type) && (os.isWindows || os.isOSX)) {
             if (this.hasEventListener(type)) {