Skip to content

Commit

Permalink
Merge pull request #1842 from openfl/develop
Browse files Browse the repository at this point in the history 
merge develop into feature branch
  • Loading branch information
@dimensionscape
dimensionscape authored Sep 23, 2024
2 parents e1457e7 + dd79e58 commit d4f3612
Show file tree
Hide file tree
Showing 29 changed files with 893 additions and 582 deletions.
93 changes: 54 additions & 39 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -49,23 +49,23 @@ jobs:
lime rebuild linux -64 -release -nocolor -verbose -nocffi
lime rebuild hl -clean -release -nocolor -verbose -nocffi

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux-NDLL
path: |
ndll/Linux/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux64-NDLL
path: |
ndll/Linux64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux64-Hashlink
path: |
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
runs-on: macos-12
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -120,7 +120,8 @@ jobs:

- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl -LO https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ./hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet

Expand All @@ -137,17 +138,26 @@ jobs:
- name: Rebuild Lime (macOS)
run: |
lime rebuild macos -clean -release -64 -nocolor -verbose -nocffi
lime rebuild macos -clean -release -arm64 -nocolor -verbose -nocffi
lime rebuild hl -clean -release -nocolor -verbose -nocffi

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Mac64-NDLL
path: |
ndll/Mac64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: MacArm64-NDLL
path: |
ndll/MacArm64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v4
with:
name: Mac64-Hashlink
path: |
Expand Down Expand Up @@ -177,7 +187,7 @@ jobs:
runs-on: windows-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -211,29 +221,29 @@ jobs:
lime rebuild windows -64 -release -nocolor -verbose -nocffi
lime rebuild hl -clean -release -nocolor -verbose -nocffi

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows-NDLL
path: |
ndll/Windows/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows64-NDLL
path: |
ndll/Windows64/
!**/.gitignore
if-no-files-found: error

# - uses: actions/upload-artifact@v3
# - uses: actions/upload-artifact@v4
# with:
# name: Windows-Hashlink
# path: |
# templates/bin/hl/Windows
# if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows64-Hashlink
path: |
Expand Down Expand Up @@ -263,7 +273,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -273,7 +283,7 @@ jobs:
with:
ndk-version: r21e

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: 11
Expand Down Expand Up @@ -313,7 +323,7 @@ jobs:
run: |
lime rebuild android -release -nocolor -verbose -nocffi -eval

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Android-NDLL
path: |
Expand Down Expand Up @@ -343,7 +353,7 @@ jobs:
runs-on: macos-12
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -374,7 +384,7 @@ jobs:
run: |
lime rebuild ios -clean -release -verbose -nocolor -eval

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: iPhone-NDLL
path: |
Expand Down Expand Up @@ -406,7 +416,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -441,57 +451,62 @@ jobs:
cp project/lib/hashlink/src/hl.h templates/bin/hl/include/hl.h
cp project/lib/hashlink/src/hlc_main.c templates/bin/hl/include/hlc_main.c

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Android-NDLL
path: ndll/Android/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: iPhone-NDLL
path: ndll/iPhone/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux-NDLL
path: ndll/Linux/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux64-NDLL
path: ndll/Linux64/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Mac64-NDLL
path: ndll/Mac64/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: MacArm64-NDLL
path: ndll/MacArm64/

- uses: actions/download-artifact@v4
with:
name: Windows-NDLL
path: ndll/Windows/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Windows64-NDLL
path: ndll/Windows64/

# - uses: actions/download-artifact@v3
# - uses: actions/download-artifact@v4
# with:
# name: Windows-Hashlink
# path: templates/bin/hl/Windows

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Windows64-Hashlink
path: templates/bin/hl/Windows64

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Mac64-Hashlink
path: templates/bin/hl/Mac64

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux64-Hashlink
path: templates/bin/hl/Linux64
Expand All @@ -501,7 +516,7 @@ jobs:
run: |
haxe svg.hxml

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lime-haxelib
path: |
Expand All @@ -516,7 +531,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand All @@ -536,7 +551,7 @@ jobs:
run: |
haxe build.hxml

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lime-docs
path: docs/pages
Expand All @@ -546,7 +561,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -589,7 +604,7 @@ jobs:
haxe-version: [4.0.5, 4.1.5, 4.2.5, 4.3.1]
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -659,7 +674,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down Expand Up @@ -709,7 +724,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down Expand Up @@ -738,7 +753,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -816,7 +831,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
Changelog
=========

8.1.3 (07/22/2024)
------------------

* Fixed Unicode conversion issues with various APIs, including as clipboard, window text, file dialogs, and fonts.
* Fixed Android builds with the `-emulator` flag that broke when using newer Android SDKs.
* Fixed "Could not link to neko" error message on macOS when lime.ndll is built with Xcode 15.
* Fixed system environment variables with the same name as common targets conflicting with other targets.
* Fixed `<echo/>` and `<log/>` output confusing Haxe's completion server. Now skipped when `display` is defined.
* Fixed `Clipboard.text` incorrectly getting cleared to null when targeting HTML5.
* Fixed integer value parsing in _project.xml_, including immediately reporting errors for invalid values.
* Fixed incorrect path discovery for NDLL files that found source directory instead.
* Fixed missing error message if HXP project class name does not match file name.
* Fixed unspecified behavior from `null` keys in `ObjectPool`.
* Fixed some issues when running Haxe built natively for Apple Silicon.
* Fixed missing cancellation of vibration on Android when app is paused or destroyed.
* Fixed static linking of native curl library on macOS.
* Fixed deprecation warnings in Android Gradle builds.

8.1.2 (03/13/2024)
------------------

Expand Down
8 changes: 4 additions & 4 deletions externs/air/flash/net/Socket.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils.
@:require(flash11) var bytesPending(default, never):UInt;
var connected(default, never):Bool;
var endian:flash.utils.Endian;
var objectEncoding:UInt;
var objectEncoding:#if openfl openfl.net.ObjectEncoding #else UInt #end;
@:require(flash10) var timeout:UInt;
#if air
var localAddress(default, never):String;
Expand All @@ -20,7 +20,7 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils.
@:flash.property @:require(flash11) var bytesPending(get, never):UInt;
@:flash.property var connected(get, never):Bool;
@:flash.property var endian(get, set):flash.utils.Endian;
@:flash.property var objectEncoding(get, set):UInt;
@:flash.property var objectEncoding(get, set):#if openfl openfl.net.ObjectEncoding #else UInt #end;
@:flash.property @:require(flash10) var timeout(get, set):UInt;
#if air
@:flash.property var localAddress(get, never):String;
Expand Down Expand Up @@ -65,7 +65,7 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils.
private function get_bytesPending():UInt;
private function get_connected():Bool;
private function get_endian():flash.utils.Endian;
private function get_objectEncoding():UInt;
private function get_objectEncoding():#if openfl openfl.net.ObjectEncoding #else UInt #end;
private function get_timeout():UInt;
#if air
private function get_localAddress():String;
Expand All @@ -74,7 +74,7 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils.
private function get_remotePort():Int;
#end
private function set_endian(value:flash.utils.Endian):flash.utils.Endian;
private function set_objectEncoding(value:UInt):UInt;
private function set_objectEncoding(value:#if openfl openfl.net.ObjectEncoding #else UInt #end):#if openfl openfl.net.ObjectEncoding #else UInt #end;
private function set_timeout(value:UInt):UInt;
#end
}
Loading

0 comments on commit d4f3612

Please sign in to comment.