Skip to content

Commit b47ad8e

Browse files
chippmannchippmann
committed
Update dependencies
1 parent 1bed8f7 commit b47ad8e

File tree

30 files changed

+142
-141
lines changed

30 files changed

+142
-141
lines changed

‎harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ functions = [
3333
basis,
3434
color,
3535
plane,
36-
quat,
3736
rect2,
38-
transform,
3937
transform2_d,
4038
vector2,
41-
vector3
39+
vector3,
40+
quat,
41+
transform
4242
]

‎harness/tests/scripts/godot/tests/JavaTestClass.gdj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ properties = [
3232
dictionary
3333
]
3434
functions = [
35-
_ready,
36-
greeting,
35+
greeting,
36+
_ready,
3737
connect_and_trigger_signal,
3838
signal_callback
3939
]

‎kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/ClassRule.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ class MemberRule : GodotApiRule<EnrichedClassTask>() {
116116
}
117117

118118
class BindingRule : GodotApiRule<EnrichedClassTask>() {
119-
override fun apply(classTask: EnrichedClassTask, context: GenerationContext) = configure(classTask.builder) {
120-
val clazz = classTask.clazz
119+
override fun apply(task: EnrichedClassTask, context: GenerationContext) = configure(task.builder) {
120+
val clazz = task.clazz
121121
clazz.methods
122122
.filter { !it.isVirtual }
123123
.onEach {
124-
classTask.bindings.addProperty(
124+
task.bindings.addProperty(
125125
PropertySpec
126126
.builder(it.voidPtrVariableName, VOID_PTR)
127127
.addModifiers(KModifier.INTERNAL)

‎kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/FileRule.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class WarningRule() : GodotApiRule<FileTask>() {
5555
}
5656

5757
class StaticRule : GodotApiRule<FileTask>() {
58-
override fun apply(fileTask: FileTask, context: GenerationContext) = configure(fileTask.builder) {
59-
for (classTask in fileTask.classes) {
58+
override fun apply(task: FileTask, context: GenerationContext) = configure(task.builder) {
59+
for (classTask in task.classes) {
6060
for (method in classTask.enrichedStaticMethods) {
6161
method.builder.addAnnotation(JvmStatic::class)
6262
}
@@ -114,7 +114,7 @@ class DocumentationRule : GodotApiRule<ApiTask>() {
114114
private val codeBlockRegex = Regex("""```[\s\S]*?```""")
115115
private val doubleSkipRegex = Regex("(?<!\n)\n(?!\n)")
116116

117-
override fun apply(fileTask: ApiTask, context: GenerationContext) {
117+
override fun apply(task: ApiTask, context: GenerationContext) {
118118
val enumValues = context
119119
.globalEnumList
120120
.flatMap { it.values }

‎kt/api-generator/src/main/kotlin/godot/codegen/models/ApiDescription.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class ApiDescription @JsonCreator constructor(
7-
@JsonProperty("header") val header: Header,
8-
@JsonProperty("builtin_class_sizes") val builtinClassSizes: List<BuiltinClassSizes>,
9-
@JsonProperty("builtin_class_member_offsets") val builtinClassMemberOffsets: List<BuiltinClassMemberOffsets>,
10-
@JsonProperty("global_constants") val globalConstants: List<Constant>,
11-
@JsonProperty("global_enums") val globalEnums: List<Enum>,
12-
@JsonProperty("utility_functions") val utilityFunctions: List<UtilityFunction>,
13-
@JsonProperty("builtin_classes") val builtinClasses: List<BuiltinClass>,
14-
@JsonProperty("classes") val classes: List<Class>,
15-
@JsonProperty("singletons") val singletons: List<Singleton>,
16-
@JsonProperty("native_structures") val nativeStructures: List<NativeStructure>
7+
@param:JsonProperty("header") val header: Header,
8+
@param:JsonProperty("builtin_class_sizes") val builtinClassSizes: List<BuiltinClassSizes>,
9+
@param:JsonProperty("builtin_class_member_offsets") val builtinClassMemberOffsets: List<BuiltinClassMemberOffsets>,
10+
@param:JsonProperty("global_constants") val globalConstants: List<Constant>,
11+
@param:JsonProperty("global_enums") val globalEnums: List<Enum>,
12+
@param:JsonProperty("utility_functions") val utilityFunctions: List<UtilityFunction>,
13+
@param:JsonProperty("builtin_classes") val builtinClasses: List<BuiltinClass>,
14+
@param:JsonProperty("classes") val classes: List<Class>,
15+
@param:JsonProperty("singletons") val singletons: List<Singleton>,
16+
@param:JsonProperty("native_structures") val nativeStructures: List<NativeStructure>
1717
)

‎kt/api-generator/src/main/kotlin/godot/codegen/models/Argument.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class Argument @JsonCreator constructor(
7-
@JsonProperty("name") val name: String,
8-
@JsonProperty("type") val type: String,
9-
@JsonProperty("meta") val meta: String?,
10-
@JsonProperty("default_value") val defaultValue: String?
7+
@param:JsonProperty("name") val name: String,
8+
@param:JsonProperty("type") val type: String,
9+
@param:JsonProperty("meta") val meta: String?,
10+
@param:JsonProperty("default_value") val defaultValue: String?
1111
)

‎kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClass.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class BuiltinClass @JsonCreator constructor(
7-
@JsonProperty("name") val name: String,
8-
@JsonProperty("is_keyed") val isKeyed: Boolean,
9-
@JsonProperty("operators") val operators: List<Operator>,
10-
@JsonProperty("constructors") val constructors: List<Constructor>,
11-
@JsonProperty("has_destructor") val hasDestructor: Boolean,
12-
@JsonProperty("methods") val methods: List<Method>?,
13-
@JsonProperty("members") val members: List<Member>?,
14-
@JsonProperty("constants") val constants: List<Constant>?,
15-
@JsonProperty("enums") val enums: List<Enum>?,
16-
@JsonProperty("indexing_return_type") val indexingReturnType: String?,
17-
@JsonProperty("description") val description: String?,
18-
@JsonProperty("brief_description") val briefDescription: String?
7+
@param:JsonProperty("name") val name: String,
8+
@param:JsonProperty("is_keyed") val isKeyed: Boolean,
9+
@param:JsonProperty("operators") val operators: List<Operator>,
10+
@param:JsonProperty("constructors") val constructors: List<Constructor>,
11+
@param:JsonProperty("has_destructor") val hasDestructor: Boolean,
12+
@param:JsonProperty("methods") val methods: List<Method>?,
13+
@param:JsonProperty("members") val members: List<Member>?,
14+
@param:JsonProperty("constants") val constants: List<Constant>?,
15+
@param:JsonProperty("enums") val enums: List<Enum>?,
16+
@param:JsonProperty("indexing_return_type") val indexingReturnType: String?,
17+
@param:JsonProperty("description") val description: String?,
18+
@param:JsonProperty("brief_description") val briefDescription: String?
1919
)

‎kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassMemberOffsets.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class BuiltinClassMemberOffsets @JsonCreator constructor(
7-
@JsonProperty("build_configuration") val buildConfiguration: String,
8-
@JsonProperty("classes") val classes: List<ClassMemberOffsets>
7+
@param:JsonProperty("build_configuration") val buildConfiguration: String,
8+
@param:JsonProperty("classes") val classes: List<ClassMemberOffsets>
99
)

‎kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassSizes.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class BuiltinClassSizes @JsonCreator constructor(
7-
@JsonProperty("build_configuration") val buildConfiguration: String,
8-
@JsonProperty("sizes") val sizes: List<Size>
7+
@param:JsonProperty("build_configuration") val buildConfiguration: String,
8+
@param:JsonProperty("sizes") val sizes: List<Size>
99
)

‎kt/api-generator/src/main/kotlin/godot/codegen/models/Class.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonProperty
55

66
data class Class @JsonCreator constructor(
7-
@JsonProperty("name") val name: String,
8-
@JsonProperty("is_refcounted") val isRefCounted: Boolean,
9-
@JsonProperty("is_instantiable") val isInstantiable: Boolean,
10-
@JsonProperty("inherits") val inherits: String?,
11-
@JsonProperty("api_type") val apiType: String,
12-
@JsonProperty("enums") val enums: List<Enum>?,
13-
@JsonProperty("methods") val methods: List<Method>?,
14-
@JsonProperty("properties") val properties: List<Property>?,
15-
@JsonProperty("constants") val constants: List<Constant>?,
16-
@JsonProperty("signals") val signals: List<Signal>?,
17-
@JsonProperty("description") val description: String?,
18-
@JsonProperty("brief_description") val briefDescription: String?
7+
@param:JsonProperty("name") val name: String,
8+
@param:JsonProperty("is_refcounted") val isRefCounted: Boolean,
9+
@param:JsonProperty("is_instantiable") val isInstantiable: Boolean,
10+
@param:JsonProperty("inherits") val inherits: String?,
11+
@param:JsonProperty("api_type") val apiType: String,
12+
@param:JsonProperty("enums") val enums: List<Enum>?,
13+
@param:JsonProperty("methods") val methods: List<Method>?,
14+
@param:JsonProperty("properties") val properties: List<Property>?,
15+
@param:JsonProperty("constants") val constants: List<Constant>?,
16+
@param:JsonProperty("signals") val signals: List<Signal>?,
17+
@param:JsonProperty("description") val description: String?,
18+
@param:JsonProperty("brief_description") val briefDescription: String?
1919
) {
2020
fun copy(newName: String) = Class(
2121
newName,

0 commit comments

Comments
 (0)