Skip to content

Commit d93c76f

Browse files
CedNaruCedNaru
authored
Update to 0.13.0 (#817)
1 parent 844fc57 commit d93c76f

File tree

13 files changed

+27
-27
lines changed

13 files changed

+27
-27
lines changed

‎.github/workflows/trigger_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666
- run: |
6767
echo "Setup done"
6868
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
69-
godot-kotlin-jvm-version: "0.12.3-4.4.1"
69+
godot-kotlin-jvm-version: "0.13.0-4.4.1"
7070
godot-version: "4.4.1-stable"
71-
build-version: "0.12.3"
71+
build-version: "0.13.0"
7272
jvm-version: "17"
7373

7474
build-jvm:

‎.github/workflows/trigger_on_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
- run: |
1515
echo "Setup done"
1616
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
17-
godot-kotlin-jvm-version: "0.12.3-4.4.1"
17+
godot-kotlin-jvm-version: "0.13.0-4.4.1"
1818
godot-version: "4.4.1-stable"
19-
build-version: "0.12.3"
19+
build-version: "0.13.0"
2020
jvm-version: "17"
2121

2222
build-jvm:

‎.github/workflows/trigger_on_push_master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- run: |
2020
echo "Setup done"
2121
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
22-
godot-kotlin-jvm-version: "0.12.3-4.4.1"
22+
godot-kotlin-jvm-version: "0.13.0-4.4.1"
2323
godot-version: "4.4.1-stable"
24-
build-version: "0.12.3"
24+
build-version: "0.13.0"
2525
jvm-version: "17"
2626

2727
build-jvm:

‎.github/workflows/trigger_on_tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
- run: |
2727
echo "Setup done"
2828
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
29-
godot-kotlin-jvm-version: "0.12.3-4.4.1"
29+
godot-kotlin-jvm-version: "0.13.0-4.4.1"
3030
godot-version: "4.4.1-stable"
31-
build-version: "0.12.3"
31+
build-version: "0.13.0"
3232
jvm-version: "17"
3333

3434
build-jvm:

‎config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ def can_build(env, platform):
22
return True
33

44
def configure(env):
5-
env.add_module_version_string("jvm.0.12.3")
5+
env.add_module_version_string("jvm.0.13.0")

‎docs/src/doc/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ While Kotlin and Godot supports a wide range of platforms, this module for the m
6464

6565
The module uses semantic versioning for its own versions but adds a suffix for the supported Godot version:
6666

67-
Full version: `0.12.3-4.4.1`
67+
Full version: `0.13.0-4.4.1`
6868

69-
Module Version: `0.12.3`
69+
Module Version: `0.13.0`
7070

7171
Supported Godot Version: `4.4.1`
7272

‎docs/src/doc/user-guide/exporting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ While our gradle plugin is able to automatically find the newest installed build
105105
- Setting the `d8` tool:
106106
```kt
107107
godot {
108-
d8ToolPath = File("${System.getenv("ANDROID_SDK_ROOT")}/build-tools/35.0.0/d8")
108+
d8ToolPath = File("${System.getenv("ANDROID_SDK_ROOT")}/build-tools/36.0.0/d8")
109109
}
110110
```
111111

112112
- Setting the `androidCompileSdkDir` to your target SDK version (most of the time, you want to set it to the newest version available):
113113
```kt
114114
godot {
115-
androidCompileSdkDir = File("${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-35")
115+
androidCompileSdkDir = File("${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-36")
116116
}
117117
```
118118

‎harness/tests/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ godot {
1717

1818
//uncomment to test android
1919
// isAndroidExportEnabled.set(true)
20-
// d8ToolPath.set(File("${System.getenv("ANDROID_SDK_ROOT")}/build-tools/35.0.0/d8"))
21-
// androidCompileSdkDir.set(File("${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-35"))
20+
// d8ToolPath.set(File("${System.getenv("ANDROID_SDK_ROOT")}/build-tools/36.0.0/d8"))
21+
// androidCompileSdkDir.set(File("${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-36"))
2222

2323
// uncomment to test graal vm native image
2424
// isGraalNativeImageExportEnabled.set(true)

‎kt/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22

3-
godotKotlinJvm = "0.12.3"
3+
godotKotlinJvm = "0.13.0"
44
kotlin = "2.1.10" # https://kotlinlang.org/docs/releases.html#release-details
55
kotlinCoroutine = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines/releases
66
godot = "4.4.1"

‎kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ open class GodotExtension(objects: ObjectFactory) {
9090
/**
9191
* path to the d8 tool used for desugaring and converting the jar to a dex file
9292
*
93-
* example: "${System.getenv("ANDROID_SDK_ROOT")}/build-tools/35.0.0/d8"
93+
* example: "${System.getenv("ANDROID_SDK_ROOT")}/build-tools/36.0.0/d8"
9494
*/
9595
var d8ToolPath: RegularFileProperty = objects.fileProperty()
9696

9797
/**
9898
* path to the sdk dir for your target sdk compilation dir
9999
*
100-
* example: "${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-35"
100+
* example: "${System.getenv("ANDROID_SDK_ROOT")}/platforms/android-36"
101101
*/
102102
var androidCompileSdkDir: RegularFileProperty = objects.fileProperty()
103103

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener {
6767
private var artifact = "game"
6868
private var version = "0.0.1-SNAPSHOT"
6969
private var isAndroidEnabled = false
70-
private var d8Path = "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/35.0.0/d8"
71-
private var androidCompileSdkDir = "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-35"
70+
private var d8Path = "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/36.0.0/d8"
71+
private var androidCompileSdkDir = "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-36"
7272

7373
private var isGraalNativeImageEnabled = false
7474
private var graalVmDirectory = "\${System.getenv(\"GRAALVM_HOME\")}"
@@ -232,12 +232,12 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener {
232232
.replace(
233233
"D8_TOOL_PATH",
234234
wizardContext.getUserData(d8ToolPathKey)
235-
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/35.0.0/d8"
235+
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/36.0.0/d8"
236236
)
237237
.replace(
238238
"ANDROID_COMPILE_SDK_DIR",
239239
wizardContext.getUserData(androidCompileSdkDirKey)
240-
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-35"
240+
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-36"
241241
)
242242
.replace(
243243
"IS_GRAAL_VM_ENABLED",
@@ -289,12 +289,12 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener {
289289
.replace(
290290
"D8_TOOL_PATH",
291291
wizardContext.getUserData(d8ToolPathKey)
292-
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/35.0.0/d8"
292+
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/build-tools/36.0.0/d8"
293293
)
294294
.replace(
295295
"ANDROID_COMPILE_SDK_DIR",
296296
wizardContext.getUserData(androidCompileSdkDirKey)
297-
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-35"
297+
?: "\${System.getenv(\"ANDROID_SDK_ROOT\")}/platforms/android-36"
298298
)
299299
.replace(
300300
"IS_GRAAL_VM_ENABLED",

‎src/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef GODOT_JVM_VERSION_H
22
#define GODOT_JVM_VERSION_H
33

4-
constexpr const char* GODOT_KOTLIN_VERSION = "0.12.3-4.4.1";
4+
constexpr const char* GODOT_KOTLIN_VERSION = "0.13.0-4.4.1";
55

66
#endif// GODOT_JVM_VERSION_H

‎versionBumpGuide.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ When updating this project version, here the list of strings to changes:
55
- config.py: Change the String to "jvm-x.x.x".
66

77
If you've updated the kotlin version, ensure to check if the R8 version is compatible with the chosen kotlin version! Then update the required minimum build tool versions by doing a search and replace on the following strings:
8-
- `android-35`
9-
- `35.0.0`
8+
- `android-36`
9+
- `36.0.0`

0 commit comments

Comments
 (0)