Skip to content

Commit

Permalink
chore: update to godot 3.5.1 (#359)
Browse files Browse the repository at this point in the history
  • Loading branch information
piiertho authored Oct 2, 2022
1 parent d0b594d commit 5c0aea1
Show file tree
Hide file tree
Showing 62 changed files with 2,508 additions and 2,335 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/check-pr-engine-editor-debug-and-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]

env:
SCONS_CACHE_MSVC_CONFIG: true
GODOT_BASE_VERSION: 3.5.0
GODOT_BASE_VERSION: 3.5.1

jobs:
build-godot-bootstrap:
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-pr-engine-editor-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]

env:
SCONS_CACHE_MSVC_CONFIG: true
GODOT_BASE_VERSION: 3.5.0
GODOT_BASE_VERSION: 3.5.1

jobs:
build-editor-release:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-pr-engine-export-template-debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]

env:
SCONS_CACHE_MSVC_CONFIG: true
GODOT_BASE_VERSION: 3.5.0
GODOT_BASE_VERSION: 3.5.1

jobs:
build-export-debug:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]

env:
SCONS_CACHE_MSVC_CONFIG: true
GODOT_BASE_VERSION: 3.5.0
GODOT_BASE_VERSION: 3.5.1

jobs:
build-export-release:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-export-template-debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable

- name: Clone Godot JVM module.
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-export-template-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable

- name: Clone Godot JVM module.
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-godot-editor-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable

- name: Clone Godot JVM module.
uses: actions/checkout@v2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-godot-library.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: godotengine/godot
ref: 3.5-stable
ref: 3.5.1-stable
- name: Clone Godot JVM module.
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/doc/contribution/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ To build our module, you need to same dependencies as the ones described in the

Make sure that Java is installed and its PATH set in your system as well (at least Java 9 is needed!).

1. Clone godot repo with the stable tag you want to develop for (3.5-stable in this example). `git clone [email protected]:godotengine/godot.git 3.5-stable --recursive`
1. Clone godot repo with the stable tag you want to develop for (3.5.1-stable in this example). `git clone [email protected]:godotengine/godot.git 3.5-stable --recursive`

2. In the `godot-root` dir, run the following command: `git submodule add [email protected]:utopia-rise/godot-kotlin-jvm.git modules/kotlin_jvm`

Expand Down
4 changes: 2 additions & 2 deletions docs/src/doc/user-guide/versioning.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The module uses semantic versioning for its own versions but adds a suffix for the supported godot version:

Full version: `0.5.0-3.5.0`
Full version: `0.5.0-3.5.1`

Module Version: `0.5.0`

Supported Godot Version: `3.5.0`
Supported Godot Version: `3.5.1`
74 changes: 65 additions & 9 deletions kt/api-generator/src/main/resources/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -10307,7 +10307,7 @@
},
{
"name": "has_filter",
"return_type": "String",
"return_type": "bool",
"is_editor": false,
"is_noscript": false,
"is_const": false,
Expand Down Expand Up @@ -52966,7 +52966,7 @@
"default_value": "(0, 0)"
},
{
"name": "at_position",
"name": "index",
"type": "int",
"has_default_value": true,
"default_value": "-1"
Expand Down Expand Up @@ -53442,7 +53442,7 @@
"default_value": "(0, 0, 0)"
},
{
"name": "at_position",
"name": "index",
"type": "int",
"has_default_value": true,
"default_value": "-1"
Expand Down Expand Up @@ -60245,6 +60245,18 @@
"type": "Variant",
"has_default_value": false,
"default_value": ""
},
{
"name": "field",
"type": "String",
"has_default_value": false,
"default_value": ""
},
{
"name": "changing",
"type": "bool",
"has_default_value": false,
"default_value": ""
}
]
},
Expand Down Expand Up @@ -96339,7 +96351,7 @@
"default_value": ""
},
{
"name": "at_position",
"name": "index",
"type": "int",
"has_default_value": true,
"default_value": "-1"
Expand Down Expand Up @@ -96475,7 +96487,7 @@
"is_from_script": false,
"arguments": [
{
"name": "i",
"name": "index",
"type": "int",
"has_default_value": false,
"default_value": ""
Expand Down Expand Up @@ -96572,7 +96584,7 @@
"is_from_script": false,
"arguments": [
{
"name": "i",
"name": "index",
"type": "int",
"has_default_value": false,
"default_value": ""
Expand Down Expand Up @@ -96724,7 +96736,7 @@
"is_from_script": false,
"arguments": [
{
"name": "i",
"name": "index",
"type": "int",
"has_default_value": false,
"default_value": ""
Expand Down Expand Up @@ -104388,7 +104400,7 @@
"is_from_script": false,
"arguments": [
{
"name": "nap",
"name": "map",
"type": "RID",
"has_default_value": false,
"default_value": ""
Expand Down Expand Up @@ -109366,7 +109378,7 @@
"is_from_script": false,
"arguments": [
{
"name": "nap",
"name": "map",
"type": "RID",
"has_default_value": false,
"default_value": ""
Expand Down Expand Up @@ -167074,6 +167086,25 @@
"arguments": [
]
},
{
"name": "get_tab_button_icon",
"return_type": "Texture",
"is_editor": false,
"is_noscript": false,
"is_const": true,
"is_reverse": false,
"is_virtual": false,
"has_varargs": false,
"is_from_script": false,
"arguments": [
{
"name": "tab_idx",
"type": "int",
"has_default_value": false,
"default_value": ""
}
]
},
{
"name": "get_tab_close_display_policy",
"return_type": "enum.Tabs::CloseButtonDisplayPolicy",
Expand Down Expand Up @@ -167341,6 +167372,31 @@
}
]
},
{
"name": "set_tab_button_icon",
"return_type": "void",
"is_editor": false,
"is_noscript": false,
"is_const": false,
"is_reverse": false,
"is_virtual": false,
"has_varargs": false,
"is_from_script": false,
"arguments": [
{
"name": "tab_idx",
"type": "int",
"has_default_value": false,
"default_value": ""
},
{
"name": "icon",
"type": "Texture",
"has_default_value": false,
"default_value": ""
}
]
},
{
"name": "set_tab_close_display_policy",
"return_type": "void",
Expand Down
2 changes: 1 addition & 1 deletion kt/buildSrc/src/main/kotlin/DependenciesVersions.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object DependenciesVersions {
const val godotVersion: String = "3.5.0"
const val godotVersion: String = "3.5.1"
const val shadowJarPluginVersion: String = "7.1.2"
const val kotlinPoetVersion: String = "1.12.0"
const val kspVersion: String = "1.7.10-1.0.6"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5c0aea1

Please sign in to comment.