Skip to content

Commit 07113b1

Browse files
authored
Update versions for release (#150)
* Update versions for release * Bump tests version to next version (`0.1.4`) * Change versioning in harness projects * Fix cleanup code causing memory leak
1 parent a5b88d7 commit 07113b1

10 files changed

Lines changed: 20 additions & 20 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
kotlin("jvm") version "1.4.10"
3-
id("com.utopia-rise.godot-jvm") version "0.1.0-3.2.3"
2+
kotlin("jvm") version "1.4.32"
3+
id("com.utopia-rise.godot-jvm")
44
}
55

66
repositories {
7-
jcenter()
7+
mavenCentral()
88
}

harness/benchmarks/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pluginManagement {
2929
}
3030
resolutionStrategy.eachPlugin {
3131
if (requested.id.id == "com.utopia-rise.godot-jvm") {
32-
useModule("com.utopia-rise:godot-gradle-plugin:0.1.0-3.2.3")
32+
useModule("com.utopia-rise:godot-gradle-plugin:${requested.version}")
3333
}
3434
if (requested.id.id == "com.utopia-rise.api-generator") {
35-
useModule("com.utopia-rise:api-generator:0.0.1")
35+
useModule("com.utopia-rise:api-generator:${requested.version}")
3636
}
3737
}
3838
}

harness/bunnymark/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
plugins {
3-
kotlin("jvm") version "1.4.10"
4-
id("com.utopia-rise.godot-jvm") version "0.1.0-3.2.3"
3+
kotlin("jvm") version "1.4.32"
4+
id("com.utopia-rise.godot-jvm")
55
}
66

77
repositories {
8-
jcenter()
8+
mavenCentral()
99
}

harness/bunnymark/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pluginManagement {
2929
}
3030
resolutionStrategy.eachPlugin {
3131
if (requested.id.id == "com.utopia-rise.godot-jvm") {
32-
useModule("com.utopia-rise:godot-gradle-plugin:0.1.0-3.2.3")
32+
useModule("com.utopia-rise:godot-gradle-plugin:${requested.version}")
3333
}
3434
if (requested.id.id == "com.utopia-rise.api-generator") {
35-
useModule("com.utopia-rise:api-generator:0.0.1")
35+
useModule("com.utopia-rise:api-generator:${requested.version}")
3636
}
3737
}
3838
}

harness/tests/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
plugins {
3-
kotlin("jvm") version "1.4.10"
4-
id("com.utopia-rise.godot-kotlin-jvm") version "0.1.3-3.2.3-SNAPSHOT"
3+
kotlin("jvm") version "1.4.32"
4+
id("com.utopia-rise.godot-kotlin-jvm")
55
}
66

77
repositories {

harness/tests/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ pluginManagement {
3030
}
3131
resolutionStrategy.eachPlugin {
3232
if (requested.id.id == "com.utopia-rise.godot-kotlin-jvm") {
33-
useModule("com.utopia-rise:godot-gradle-plugin:0.1.3-3.2.3-SNAPSHOT")
33+
useModule("com.utopia-rise:godot-gradle-plugin:${requested.version}")
3434
}
3535
if (requested.id.id == "com.utopia-rise.api-generator") {
36-
useModule("com.utopia-rise:api-generator:0.0.1")
36+
useModule("com.utopia-rise:api-generator:${requested.version}")
3737
}
3838
}
3939
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
const val godotKotlinJvmVersion = "0.1.3"
2-
const val godotKotlinIntellijPluginVersion = "0.1.2"
2+
const val godotKotlinIntellijPluginVersion = "0.1.3"

kt/godot-runtime/src/main/kotlin/godot/core/Properties.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ open class KtProperty<T : KtObject, P: Any?>(
2121
val ktPropertyInfo: KtPropertyInfo,
2222
protected val kProperty: KMutableProperty1<T, P>,
2323
protected val variantType: VariantType,
24-
internal val _defaultValue: () -> P?,
24+
internal val _defaultValueProvider: () -> P?,
2525
val isRef: Boolean
2626
) {
2727
open fun getDefaultValue() {
28-
TransferContext.writeReturnValue(_defaultValue(), variantType)
28+
TransferContext.writeReturnValue(_defaultValueProvider(), variantType)
2929
}
3030

3131
open fun callGet(instance: T) {
@@ -61,7 +61,7 @@ class KtEnumProperty<T : KtObject, P : Any>(
6161
false
6262
) {
6363
override fun getDefaultValue() {
64-
TransferContext.writeReturnValue(getValueConverter(_defaultValue()), VariantType.JVM_INT)
64+
TransferContext.writeReturnValue(getValueConverter(_defaultValueProvider()), VariantType.JVM_INT)
6565
}
6666

6767
override fun callGet(instance: T) {

kt/godot-runtime/src/main/kotlin/godot/runtime/Bootstrap.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class Bootstrap {
137137
unloadClasses(it.classes.toTypedArray())
138138
it.classes.forEach { clazz ->
139139
clazz.properties.forEach { property ->
140-
val defaultValue = property._defaultValue
140+
val defaultValue = property._defaultValueProvider()
141141
if (defaultValue is KtObject && !defaultValue.____DO_NOT_TOUCH_THIS_isRef____() &&
142142
!defaultValue.____DO_NOT_TOUCH_THIS_isSingleton____()) {
143143
defaultValue.free()

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/module/GodotModuleBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener {
132132
.replace("KOTLIN_VERSION", wizardContext.getUserData(kotlinVersionKey) ?: "1.4.32")
133133
.replace(
134134
"GODOT_KOTLIN_JVM_VERSION",
135-
"0.1.2-3.2.3"
135+
"0.1.3-3.2.3"
136136
)
137137
.replace("ANDROID_ENABLED", wizardContext.getUserData(androidEnabledKey)?.toString() ?: "false")
138138
.replace("DX_TOOL_PATH", wizardContext.getUserData(dxToolPathKey) ?: "dx")

0 commit comments

Comments
 (0)