Skip to content

Commit d0b594d

Browse files
piierthochippmann
piiertho
and
chippmann
authored
Feature: Update to godot 3.5 and MacOS universal export app (#356)
* Feature/update to godot 3.x #300 * Fix compilation errors for call methods with changed arg counts * chore: Update to godot 3.5-stable (#349) * bugfix: embedd JRE in export app (#344) * feat: Make distinction between amd and arm JRE. Embedd right JRE in OSX export app. * chore: bump module version to 0.5.0 * feat: remove universal feature for osx export, make use of arm64 and x86_64 features * fix: Load JVM from res when in TOOL_ENABLED with hotspot before trying to load from JAVA_HOME * doc: change jlink doc to add arm64 support * doc: Add precision about OS exports in exporting.md Co-authored-by: Cedric Hippmann <cedric.hippmann@hotmail.com>
1 parent 8eb2be7 commit d0b594d

270 files changed

Lines changed: 36772 additions & 14174 deletions

File tree

Some content is hidden

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

‎.github/workflows/check-pr-engine-editor-debug-and-tests.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 3.4.4
6+
GODOT_BASE_VERSION: 3.5.0
77

88
jobs:
99
build-godot-bootstrap:
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v2
2020
with:
2121
repository: godotengine/godot
22-
ref: 3.4.4-stable
22+
ref: 3.5-stable
2323
- name: Clone Godot JVM module.
2424
uses: actions/checkout@v2
2525
with:
@@ -72,7 +72,7 @@ jobs:
7272
uses: actions/checkout@v2
7373
with:
7474
repository: godotengine/godot
75-
ref: 3.4.4-stable
75+
ref: 3.5-stable
7676
- name: Clone Godot JVM module.
7777
uses: actions/checkout@v2
7878
with:
@@ -152,7 +152,7 @@ jobs:
152152
uses: actions/checkout@v2
153153
with:
154154
repository: godotengine/godot
155-
ref: 3.4.4-stable
155+
ref: 3.5-stable
156156
- name: Clone Godot JVM module.
157157
uses: actions/checkout@v2
158158
with:

‎.github/workflows/check-pr-engine-editor-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 3.4.4
6+
GODOT_BASE_VERSION: 3.5.0
77

88
jobs:
99
build-editor-release:
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v2
4040
with:
4141
repository: godotengine/godot
42-
ref: 3.4.4-stable
42+
ref: 3.5-stable
4343
- name: Clone Godot JVM module.
4444
uses: actions/checkout@v2
4545
with:

‎.github/workflows/check-pr-engine-export-template-debug.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 3.4.4
6+
GODOT_BASE_VERSION: 3.5.0
77

88
jobs:
99
build-export-debug:
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@v2
4444
with:
4545
repository: godotengine/godot
46-
ref: 3.4.4-stable
46+
ref: 3.5-stable
4747
- name: Clone Godot JVM module.
4848
uses: actions/checkout@v2
4949
with:

‎.github/workflows/check-pr-engine-export-template-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 3.4.4
6+
GODOT_BASE_VERSION: 3.5.0
77

88
jobs:
99
build-export-release:
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@v2
4444
with:
4545
repository: godotengine/godot
46-
ref: 3.4.4-stable
46+
ref: 3.5-stable
4747
- name: Clone Godot JVM module.
4848
uses: actions/checkout@v2
4949
with:

‎.github/workflows/check-pr-godot-kotlin-symbol-processor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: godotengine/godot
16-
ref: 3.4.4-stable
16+
ref: 3.5-stable
1717
- name: Clone Godot JVM module.
1818
uses: actions/checkout@v2
1919
with:

‎.github/workflows/deploy-export-template-debug.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
uses: actions/checkout@v2
6363
with:
6464
repository: godotengine/godot
65-
ref: 3.4.4-stable
65+
ref: 3.5-stable
6666

6767
- name: Clone Godot JVM module.
6868
uses: actions/checkout@v2

‎.github/workflows/deploy-export-template-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
uses: actions/checkout@v2
6363
with:
6464
repository: godotengine/godot
65-
ref: 3.4.4-stable
65+
ref: 3.5-stable
6666

6767
- name: Clone Godot JVM module.
6868
uses: actions/checkout@v2

‎.github/workflows/deploy-godot-editor-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/checkout@v2
5858
with:
5959
repository: godotengine/godot
60-
ref: 3.4.4-stable
60+
ref: 3.5-stable
6161

6262
- name: Clone Godot JVM module.
6363
uses: actions/checkout@v2

‎.github/workflows/deploy-godot-kotlin-symbol-processor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v2
1818
with:
1919
repository: godotengine/godot
20-
ref: 3.4.4-stable
20+
ref: 3.5-stable
2121
- name: Clone Godot JVM module.
2222
uses: actions/checkout@v2
2323
with:

‎.github/workflows/deploy-godot-library.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v2
1818
with:
1919
repository: godotengine/godot
20-
ref: 3.4.4-stable
20+
ref: 3.5-stable
2121
- name: Clone Godot JVM module.
2222
uses: actions/checkout@v2
2323
with:

0 commit comments

Comments
 (0)