chore: update to godot 4.2.1 and bump module version to 0.8.2 (#583)

utopia-rise · Mar 10, 2024 · 4938de5 · 4938de5
1 parent 369b71f
commit 4938de5
Show file tree

Hide file tree

Showing 26 changed files with 180 additions and 66 deletions.
diff --git a/.github/workflows/check-pr-engine-editor-debug-and-tests.yaml b/.github/workflows/check-pr-engine-editor-debug-and-tests.yaml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
         run: |
@@ -85,7 +85,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
         run: |
@@ -174,7 +174,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
         run: |

diff --git a/.github/workflows/check-pr-engine-editor-release.yaml b/.github/workflows/check-pr-engine-editor-release.yaml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-engine-export-template-debug.yaml b/.github/workflows/check-pr-engine-export-template-debug.yaml
@@ -3,8 +3,8 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 4.2.0
-  GODOT_BASE_BRANCH: 4.2.0
+  GODOT_BASE_VERSION: 4.2.1
+  GODOT_BASE_BRANCH: 4.2.1
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-debug
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
         run: |
@@ -129,7 +129,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-engine-export-template-release.yaml b/.github/workflows/check-pr-engine-export-template-release.yaml
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:
@@ -128,7 +128,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-entry-generator.yaml b/.github/workflows/check-pr-entry-generator.yaml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-godot-kotlin-symbol-processor.yaml b/.github/workflows/check-pr-godot-kotlin-symbol-processor.yaml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-jvm-godot-library.yaml b/.github/workflows/check-pr-jvm-godot-library.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/deploy-export-template.yaml b/.github/workflows/deploy-export-template.yaml
@@ -165,7 +165,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
@@ -266,7 +266,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
@@ -418,7 +418,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       - name: Get release export template binary
         uses: actions/download-artifact@v3
@@ -477,7 +477,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       - name: Get release export template binary
         uses: actions/download-artifact@v3
@@ -618,7 +618,7 @@ jobs:
 
       - name: Create version.txt
         run: |
-          refVersion=4.2-stable #for easier search and replace with other `ref` occurrences
+          refVersion=4.2.1-stable #for easier search and replace with other `ref` occurrences
           templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
           echo "$templatesVersion" > templates/version.txt
         shell: bash

diff --git a/.github/workflows/deploy-godot-editor-release.yaml b/.github/workflows/deploy-godot-editor-release.yaml
@@ -74,7 +74,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       # TODO: remove once on godot 4.2.2 or newer!
       - name: Cherry pick macos fix
@@ -237,7 +237,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
 
       - name: Get editor binary
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/deploy-godot-entry-generator.yaml b/.github/workflows/deploy-godot-entry-generator.yaml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/deploy-godot-kotlin-symbol-processor.yaml b/.github/workflows/deploy-godot-kotlin-symbol-processor.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/deploy-godot-library.yaml b/.github/workflows/deploy-godot-library.yaml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 4.2-stable
+          ref: 4.2.1-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/docs/src/doc/user-guide/versioning.md b/docs/src/doc/user-guide/versioning.md
@@ -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.8.1-4.2.0`
+Full version: `0.8.2-4.2.0`
 
-Module Version: `0.8.1`
+Module Version: `0.8.2`
 
 Supported Godot Version: `4.2.0`
diff --git a/kt/api-generator/src/main/resources/api.json b/kt/api-generator/src/main/resources/api.json
@@ -2,10 +2,10 @@
 	"header": {
 		"version_major": 4,
 		"version_minor": 2,
-		"version_patch": 0,
+		"version_patch": 1,
 		"version_status": "stable",
 		"version_build": "custom_build",
-		"version_full_name": "Godot Engine v4.2.stable.custom_build"
+		"version_full_name": "Godot Engine v4.2.1.stable.custom_build"
 	},
 	"builtin_class_sizes": [
 		{
@@ -136423,6 +136423,17 @@
 			"inherits": "Node2D",
 			"api_type": "core",
 			"methods": [
+				{
+					"name": "get_rid",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2944877500,
+					"return_value": {
+						"type": "RID"
+					}
+				},
 				{
 					"name": "set_enabled",
 					"is_const": false,
@@ -136744,6 +136755,17 @@
 			"inherits": "Node3D",
 			"api_type": "core",
 			"methods": [
+				{
+					"name": "get_rid",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2944877500,
+					"return_value": {
+						"type": "RID"
+					}
+				},
 				{
 					"name": "set_enabled",
 					"is_const": false,
@@ -140341,6 +140363,17 @@
 			"inherits": "Node2D",
 			"api_type": "core",
 			"methods": [
+				{
+					"name": "get_rid",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2944877500,
+					"return_value": {
+						"type": "RID"
+					}
+				},
 				{
 					"name": "set_navigation_polygon",
 					"is_const": false,
@@ -140741,6 +140774,17 @@
 			"inherits": "Node3D",
 			"api_type": "core",
 			"methods": [
+				{
+					"name": "get_rid",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2944877500,
+					"return_value": {
+						"type": "RID"
+					}
+				},
 				{
 					"name": "set_navigation_mesh",
 					"is_const": false,

diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseMaterial3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseMaterial3D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraAttributesPhysical.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraAttributesPhysical.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt