Feature/godot 3.3.0 (#174)

* Update version to godot 3.3.0 Co-authored-by: Cedric Hippmann <[email protected]>
utopia-rise · Apr 25, 2021 · a4684db · a4684db
1 parent 3cd71ad
commit a4684db
Show file tree

Hide file tree

Showing 172 changed files with 12,472 additions and 10,089 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
@@ -3,7 +3,7 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 3.2.3
+  GODOT_BASE_VERSION: 3.3.0
 
 jobs:
   build-godot-bootstrap:
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:
@@ -64,7 +64,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:
@@ -118,7 +118,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/check-pr-engine-editor-release.yaml b/.github/workflows/check-pr-engine-editor-release.yaml
@@ -3,7 +3,7 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 3.2.3
+  GODOT_BASE_VERSION: 3.3.0
 
 jobs:
   build-editor-release:
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-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,7 +3,7 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 3.2.3
+  GODOT_BASE_VERSION: 3.3.0
 
 jobs:
   build-export-debug:
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-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
@@ -3,7 +3,7 @@ on: [pull_request]
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
-  GODOT_BASE_VERSION: 3.2.3
+  GODOT_BASE_VERSION: 3.3
 
 jobs:
   build-export-release:
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: godotengine/godot
-          ref: 3.2.3-stable
+          ref: 3.3-stable
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:

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

diff --git a/docs/src/doc/contribution/setup.md b/docs/src/doc/contribution/setup.md
@@ -2,7 +2,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 do deveop for (3.2.3-stable in this example). `git clone [email protected]:godotengine/godot.git 3.2.3-stable --recursive`
+1. Clone godot repo with the stable tag you want do deveop for (3.3-stable in this example). `git clone [email protected]:godotengine/godot.git 3.3-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`
 

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.1.0-3.2.3`
+Full version: `0.1.0-3.3.0`
 
 Module Version: `0.1.0`
 
-Supported Godot Version: `3.2.3`
+Supported Godot Version: `3.3`
diff --git a/harness/benchmarks/godot-project.csproj b/harness/benchmarks/godot-project.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/3.2.3">
+<Project Sdk="Godot.NET.Sdk/3.3.0">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <RootNamespace>godotproject</RootNamespace>

diff --git a/harness/bunnymark/Bunnymark.csproj b/harness/bunnymark/Bunnymark.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/3.2.4">
+<Project Sdk="Godot.NET.Sdk/3.3.0">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>

diff --git a/harness/bunnymark/project.godot b/harness/bunnymark/project.godot
@@ -13,39 +13,9 @@ _global_script_classes=[ {
 "class": "Bunny",
 "language": "GDScript",
 "path": "res://benchmarks/BunnymarkV3/gd/Bunny.gd"
-}, {
-"base": "Node2D",
-"class": "BunnymarkV1DrawTexture",
-"language": "Kotlin",
-"path": "res://src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt"
-}, {
-"base": "Node2D",
-"class": "BunnymarkV1Sprites",
-"language": "Kotlin",
-"path": "res://src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt"
-}, {
-"base": "Node2D",
-"class": "BunnymarkV2",
-"language": "Kotlin",
-"path": "res://src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt"
-}, {
-"base": "Node2D",
-"class": "BunnymarkV3",
-"language": "Kotlin",
-"path": "res://src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt"
-}, {
-"base": "Sprite",
-"class": "godot_benchmark_bunnymark_v3_Bunny",
-"language": "Kotlin",
-"path": "res://src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt"
 } ]
 _global_script_class_icons={
-"Bunny": "",
-"BunnymarkV1DrawTexture": "",
-"BunnymarkV1Sprites": "",
-"BunnymarkV2": "",
-"BunnymarkV3": "",
-"godot_benchmark_bunnymark_v3_Bunny": ""
+"Bunny": ""
 }
 
 [application]

diff --git a/kt/api-generator b/kt/api-generator
diff --git a/kt/buildSrc/src/main/kotlin/DependenciesVersions.kt b/kt/buildSrc/src/main/kotlin/DependenciesVersions.kt
@@ -1,5 +1,5 @@
 object DependenciesVersions {
-    const val godotVersion: String = "3.2.3"
+    const val godotVersion: String = "3.3.0"
     const val shadowJarPluginVersion: String = "6.1.0"
     const val mpaptVersion: String = "0.8.7"
     const val kotlinPoetVersion: String = "1.8.0"

diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/CoreTypeHelper.kt b/kt/godot-library/src/main/kotlin/godot/annotation/CoreTypeHelper.kt
@@ -0,0 +1,10 @@
+package godot.annotation
+
+/**
+ * Only applicable to godot core type helper functions generated in the api gen
+ *
+ * Here for the IDE checks to differentiate mutation function calls (these helper functions) from regular function calls
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class CoreTypeHelper
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Animation.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Animation.kt
+1 −0		src/main/kotlin/godot/codegen/Class.kt
+4,164 −487		src/main/resources/api.json