Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/precise-ke…
Browse files Browse the repository at this point in the history
…y-event
  • Loading branch information
EliteMasterEric committed Jun 21, 2023
2 parents 14d631d + aebf139 commit 2447ae6
Show file tree
Hide file tree
Showing 49 changed files with 1,467 additions and 46 deletions.
50 changes: 49 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,54 @@ jobs:
lime build SimpleImage flash -release -verbose -nocolor
lime build SimpleAudio flash -release -verbose -nocolor
air-samples:
needs: package-haxelib
runs-on: windows-latest
strategy:
matrix:
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1]
steps:

- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.2.5

- uses: joshtynjala/setup-adobe-air-action@v2
with:
air-version: "33.1"
accept-license: true

- name: Set HAXEPATH
run: |
echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV
- name: Install Haxe dependencies
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
with:
name: lime-haxelib
path: lime-haxelib

- name: Prepare lime
run: |
haxelib dev lime lime-haxelib
haxelib run lime setup -alias -y -nocffi
haxelib run lime config AIR_SDK ${{ env.AIR_HOME }}
- name: Create Lime samples
run: |
lime create HelloWorld -verbose -nocolor
lime create SimpleImage -verbose -nocolor
lime create SimpleAudio -verbose -nocolor
- name: Build Lime samples
run: |
lime build HelloWorld air -release -verbose -nocolor
lime build SimpleImage air -release -verbose -nocolor
lime build SimpleAudio air -release -verbose -nocolor
hashlink-samples:
needs: package-haxelib
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -868,7 +916,7 @@ jobs:
notify:
runs-on: ubuntu-20.04
needs: [package-haxelib, docs, android-samples, flash-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
needs: [package-haxelib, docs, android-samples, flash-samples, air-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
if: ${{ github.repository == 'openfl/lime' && github.event_name != 'pull_request' }}
steps:
- name: Notify Discord
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
url = https://github.com/openfl/libopenal
[submodule "project/lib/curl"]
path = project/lib/curl
url = https://github.com/openfl/libcurl
url = https://github.com/curl/curl
[submodule "project/lib/ogg"]
path = project/lib/ogg
url = https://github.com/openfl/libogg
Expand Down Expand Up @@ -54,7 +54,7 @@
url = https://github.com/openfl/libwebm
[submodule "project/lib/mbedtls"]
path = project/lib/mbedtls
url = https://github.com/openfl/libmbedtls
url = https://github.com/Mbed-TLS/mbedtls
[submodule "project/lib/mojoal"]
path = project/lib/mojoal
url = https://github.com/openfl/libmojoal
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
Changelog
=========

8.0.2 (05/31/2023)
------------------

* Resolve new `@:enum abstract` warnings for Haxe 4.3 by replacing with `enum abstract`, if current Haxe version supports it
* Resolve new `@:extern` warnings for Haxe 4.3 by replacing with `extern`, if current Haxe version supports it
* Fixed HTTPS requests failing on macOS by updating cURL and mbedtls dependencies
* Fixed calling `JNI.callMember()` and `JNI.callStatic()` with more than 7 arguments
* Fixed DPI detection on Android by using `getDisplayMetrics()`
* Fixed passing `null` or empty string for default library to `Assets.registerLibrary()` to be more consistent with other APIs
* Fixed failed Lime tools build with some Haxe versions by removing `-D no-inline`
* Fixed Haxe argument type of OpenAL `alFilteri` wrapper that should be `Int` instead of `Dynamic`
* Fixed bad UTF string conversion for `FileDialog` that sometimes displayed incorrect characters on some platforms
* Fixed HTTP request status 400 being incorrectly treated as successful on html5 target
* Fixed failed Adobe AIR for iOS build on Windows by removing check for simulators, which are available on macOS only
* Fixed detection of default iPhone simulator to avoid exceptions and support future versions of Xcode
* Fixed conflict between `window.Image` and `lime.graphics.Image` when using Genes on html5 target
* Fixed exception in Lime tools if assets directory does not exist
* Removed legacy `armv7` from default iOS target architectures because it now results in an error (now defaults to `arm64`)
* AIR for iOS or Android may specify `listen="port"` in `<config:air/>` element to use USB debugging instead of wifi debugging
* Improved fix for text fields updating properly on Android devices with html5 target
* Replaced "Could not find Neko API interface" error message with more detailed explanation and instructions

8.0.1 (02/21/2023)
------------------

Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/data/SQLCollationType.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.data;

@:native("flash.data.SQLCollationType")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLCollationType(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLCollationType(String)
{
var BINARY;
var NO_CASE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/data/SQLColumnNameStyle.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.data;

@:native("flash.data.SQLColumnNameStyle")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLColumnNameStyle(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLColumnNameStyle(String)
{
var DEFAULT;
var LONG;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/data/SQLMode.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.data;

@:native("flash.data.SQLMode")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLMode(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLMode(String)
{
var CREATE;
var READ;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/data/SQLTransactionLockType.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.data;

@:native("flash.data.SQLTransactionLockType")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLTransactionLockType(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLTransactionLockType(String)
{
var DEFERRED;
var EXCLUSIVE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/desktop/InvokeEventReason.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.desktop;

@:native("flash.desktop.InvokeEventReason")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract InvokeEventReason(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract InvokeEventReason(String)
{
var LOGIN;
var NOTIFICATION;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/desktop/NativeDragActions.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.desktop;

@:native("flash.desktop.NativeDragActions")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeDragActions(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeDragActions(String)
{
var COPY;
var LINK;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/desktop/NotificationType.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.desktop;

@:native("flash.desktop.NotificationType")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationType(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationType(String)
{
var CRITICAL;
var INFORMATIONAL;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/desktop/SystemIdleMode.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.desktop;

@:native("flash.desktop.SystemIdleMode")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemIdleMode(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SystemIdleMode(String)
{
var KEEP_AWAKE;
var NORMAL;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/NativeWindowDisplayState.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.NativeWindowDisplayState")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowDisplayState(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowDisplayState(String)
{
var MAXIMIZED;
var MINIMIZED;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/NativeWindowRenderMode.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.NativeWindowRenderMode")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowRenderMode(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowRenderMode(String)
{
var AUTO;
var CPU;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/NativeWindowResize.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.NativeWindowResize")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowResize(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowResize(String)
{
var BOTTOM;
var BOTTOM_LEFT;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/NativeWindowSystemChrome.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.NativeWindowSystemChrome")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowSystemChrome(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowSystemChrome(String)
{
var ALTERNATE;
var NONE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/NativeWindowType.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.NativeWindowType")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowType(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowType(String)
{
var LIGHTWEIGHT;
var NORMAL;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/StageAspectRatio.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.StageAspectRatio")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageAspectRatio(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageAspectRatio(String)
{
var ANY;
var LANDSCAPE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display/StageOrientation.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display;

@:native("flash.display.StageOrientation")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageOrientation(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageOrientation(String)
{
var DEFAULT;
var ROTATED_LEFT;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/display3D/Context3DProfile.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.display3D;

@:native("flash.display3D.Context3DProfile")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract Context3DProfile(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract Context3DProfile(String)
{
var BASELINE;
var BASELINE_CONSTRAINED;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/errors/SQLErrorOperation.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.errors;

@:native("flash.errors.SQLErrorOperation")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLErrorOperation(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLErrorOperation(String)
{
var ANALYZE;
var ATTACH;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/events/TouchEventIntent.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.events;

@:native("flash.events.TouchEventIntent")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract TouchEventIntent(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract TouchEventIntent(String)
{
var ERASER;
var PEN;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/filesystem/FileMode.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.filesystem;

@:native("flash.filesystem.FileMode")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract FileMode(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract FileMode(String)
{
var APPEND;
var READ;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/media/AudioPlaybackMode.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.media;

@:native("flash.media.AudioPlaybackMode")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AudioPlaybackMode(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AudioPlaybackMode(String)
{
var AMBIENT;
var MEDIA;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/media/CameraPosition.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.media;

@:native("flash.media.CameraPosition")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract CameraPosition(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract CameraPosition(String)
{
var BACK;
var FRONT;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/media/MediaType.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.media;

@:native("flash.media.MediaType")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract MediaType(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract MediaType(String)
{
var IMAGE;
var VIDEO;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/net/IPVersion.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.net;

@:native("flash.net.IPVersion")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract IPVersion(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract IPVersion(String)
{
var IPV4;
var IPV6;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/notifications/NotificationStyle.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.notifications;

@:native("flash.notifications.NotificationStyle")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationStyle(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationStyle(String)
{
var ALERT;
var BADGE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/printing/PaperSize.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.printing;

@:native("flash.printing.PaperSize")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PaperSize(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PaperSize(String)
{
var A4;
var A5;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/printing/PrintMethod.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.printing;

@:native("flash.printing.PrintMethod")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PrintMethod(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PrintMethod(String)
{
var AUTO;
var BITMAP;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/security/ReferencesValidationSetting.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.security;

@:native("flash.security.ReferencesValidationSetting")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReferencesValidationSetting(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReferencesValidationSetting(String)
{
var NEVER;
var VALID_IDENTITY;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/security/RevocationCheckSettings.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.security;

@:native("flash.security.RevocationCheckSettings")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract RevocationCheckSettings(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract RevocationCheckSettings(String)
{
var ALWAYS_REQUIRED;
var BEST_EFFORT;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/security/SignatureStatus.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.security;

@:native("flash.security.SignatureStatus")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignatureStatus(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignatureStatus(String)
{
var INVALID;
var UNKNOWN;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/security/SignerTrustSettings.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.security;

@:native("flash.security.SignerTrustSettings")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignerTrustSettings(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignerTrustSettings(String)
{
var CODE_SIGNING;
var PLAYLIST_SIGNING;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/text/AutoCapitalize.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.text;

@:native("flash.text.AutoCapitalize")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AutoCapitalize(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AutoCapitalize(String)
{
var ALL;
var NONE;
Expand Down
2 changes: 1 addition & 1 deletion externs/air/flash/text/ReturnKeyLabel.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flash.text;

@:native("flash.text.ReturnKeyLabel")
#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReturnKeyLabel(String)
#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReturnKeyLabel(String)
{
var DEFAULT;
var DONE;
Expand Down
Loading

0 comments on commit 2447ae6

Please sign in to comment.