Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions .github/workflows/build_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,32 @@ jobs:
- name: Build android debug (arm32)
cache-name: export_template_debug_android_arm32
target: template_debug
sconsflags: arch=arm32
scons-flags: arch=arm32

- name: Build android release (arm32)
cache-name: export_template_release_android_arm32
target: template_release
sconsflags: arch=arm32
scons-flags: arch=arm32

- name: Build android debug (arm64)
cache-name: export_template_debug_android_arm64
target: template_debug
sconsflags: arch=arm64
scons-flags: arch=arm64

- name: Build android release (arm64)
cache-name: export_template_release_android_arm64
target: template_release
sconsflags: arch=arm64
scons-flags: arch=arm64

- name: Build android debug (x86_64)
cache-name: export_template_debug_android_x86_64
target: template_debug
sconsflags: arch=x86_64
scons-flags: arch=x86_64

- name: Build android release (x86_64)
cache-name: export_template_release_android_x86_64
target: template_release
sconsflags: arch=x86_64
scons-flags: arch=x86_64

steps:
- name: Maximize build space
Expand Down Expand Up @@ -92,14 +92,14 @@ jobs:
- name: Compilation release (arm32)
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ env.SCONSFLAGS }} arch=arm32
scons-flags: ${{ env.SCONSFLAGS }} arch=arm32
platform: android
target: template_release

- name: Compilation
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ matrix.sconsflags }}
scons-flags: ${{ matrix.scons-flags }}
platform: android
target: ${{ matrix.target }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
- name: Build ios debug (arm64)
cache-name: export_template_debug_ios_arm64
target: template_debug
sconsflags: arch=arm64
scons-flags: arch=arm64

- name: Build ios release (arm64)
cache-name: export_template_release_ios_arm64
target: template_release
sconsflags: arch=arm64
scons-flags: arch=arm64

steps:
- name: Clone Godot Engine
Expand All @@ -49,7 +49,7 @@ jobs:
- name: ${{ matrix.name }}
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ matrix.sconsflags }}
scons-flags: ${{ matrix.scons-flags }}
platform: ios
target: ${{ matrix.target }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ jobs:
- name: Build editor release x86_64 (target=editor)
cache-name: editor_release_linux_x86_64
target: editor
sconsflags: ''
scons-flags: ''

- name: Build editor debug (target=editor, debug_symbols=true )
cache-name: editor_debug_linux_x86_64
target: editor
sconsflags: debug_symbols=true
scons-flags: debug_symbols=true

- name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
cache-name: editor_dev_linux_x86_64
target: editor
sconsflags: dev_build=yes debug_symbols=true
scons-flags: dev_build=yes debug_symbols=true

- name: Build release template x86_64
cache-name: export_template_release_linux_x86_64
target: template_release
sconsflags: ''
scons-flags: ''

- name: Build debug template x86_64
cache-name: export_template_debug_linux_x86_64
target: template_debug
sconsflags: ''
scons-flags: ''

steps:
- name: Maximize build space
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Compilation
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ matrix.sconsflags }}
scons-flags: ${{ matrix.scons-flags }}
platform: linuxbsd
target: ${{ matrix.target }}

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,52 +20,52 @@ jobs:
- name: Build editor release x86_64 (target=editor)
cache-name: editor_release_macos_x86_64
target: editor
sconsflags: arch=x86_64
scons-flags: arch=x86_64

- name: Build editor debug x86_64 (target=editor, debug_symbols=true )
cache-name: editor_debug_macos_x86_64
target: editor
sconsflags: arch=x86_64 debug_symbols=true
scons-flags: arch=x86_64 debug_symbols=true

- name: Build editor dev x86_64 (target=editor, dev_build=yes, debug_symbols=true )
cache-name: editor_dev_macos_x86_64
target: editor
sconsflags: arch=x86_64 dev_build=yes debug_symbols=true
scons-flags: arch=x86_64 dev_build=yes debug_symbols=true

- name: Build release template x86_64
cache-name: export_template_release_macos_x86_64
target: template_release
sconsflags: arch=x86_64
scons-flags: arch=x86_64

- name: Build debug template x86_64
cache-name: export_template_debug_macos_x86_64
target: template_debug
sconsflags: arch=x86_64
scons-flags: arch=x86_64

- name: Build editor release arm64 (target=editor)
cache-name: editor_release_macos_arm64
target: editor
sconsflags: arch=arm64
scons-flags: arch=arm64

- name: Build editor debug arm64 (target=editor, debug_symbols=true )
cache-name: editor_debug_macos_arm64
target: editor
sconsflags: arch=arm64 debug_symbols=true
scons-flags: arch=arm64 debug_symbols=true

- name: Build editor dev arm64 (target=editor, dev_build=yes, debug_symbols=true )
cache-name: editor_dev_macos_arm64
target: editor
sconsflags: arch=arm64 dev_build=yes debug_symbols=true
scons-flags: arch=arm64 dev_build=yes debug_symbols=true

- name: Build release template arm64
cache-name: export_template_release_macos_arm64
target: template_release
sconsflags: arch=arm64
scons-flags: arch=arm64

- name: Build debug template arm64
cache-name: export_template_debug_macos_arm64
target: template_debug
sconsflags: arch=arm64
scons-flags: arch=arm64

steps:
- name: Clone Godot Engine
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Compilation
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ matrix.sconsflags }}
scons-flags: ${{ matrix.scons-flags }}
platform: macos
target: ${{ matrix.target }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ jobs:
cache-name: editor_release_windows_x86_64
target: editor
should-clean: true
sconsflags: ''
scons-flags: ''

- name: Build editor debug (target=editor, debug_symbols=true )
cache-name: editor_debug_windows_x86_64
target: editor
should-clean: false
sconsflags: debug_symbols=true
scons-flags: debug_symbols=true

- name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
cache-name: editor_dev_windows_x86_64
target: editor
should-clean: false
sconsflags: dev_build=yes debug_symbols=true
scons-flags: dev_build=yes debug_symbols=true

- name: Build release template
cache-name: export_template_release_windows_x86_64
target: template_release
should-clean: true
sconsflags: ''
scons-flags: ''

- name: Build debug template
cache-name: export_template_debug_windows_x86_64
target: template_debug
should-clean: false
sconsflags: ''
scons-flags: ''

steps:
- name: Clone Godot Engine
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Compilation
uses: ./.github/actions/godot-build
with:
sconsflags: ${{ matrix.sconsflags }}
scons-flags: ${{ matrix.scons-flags }}
platform: windows
target: ${{ matrix.target }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trigger_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.13.1-4.4.1"
godot-version: "4.4.1-stable"
build-version: "0.13.1"
godot-kotlin-jvm-version: "0.14.0-4.5"
godot-version: "4.5-stable"
build-version: "0.14.0"
jvm-version: "17"

build-jvm:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trigger_on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.13.1-4.4.1"
godot-version: "4.4.1-stable"
build-version: "0.13.1"
godot-kotlin-jvm-version: "0.14.0-4.5"
godot-version: "4.5-stable"
build-version: "0.14.0"
jvm-version: "17"

build-jvm:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trigger_on_push_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.13.1-4.4.1"
godot-version: "4.4.1-stable"
build-version: "0.13.1"
godot-kotlin-jvm-version: "0.14.0-4.5"
godot-version: "4.5-stable"
build-version: "0.14.0"
jvm-version: "17"

build-jvm:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trigger_on_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.13.1-4.4.1"
godot-version: "4.4.1-stable"
build-version: "0.13.1"
godot-kotlin-jvm-version: "0.14.0-4.5"
godot-version: "4.5-stable"
build-version: "0.14.0"
jvm-version: "17"

build-jvm:
Expand Down
2 changes: 1 addition & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ def can_build(env, platform):
return True

def configure(env):
env.add_module_version_string("jvm.0.13.1")
env.add_module_version_string("jvm.0.14.0")
6 changes: 3 additions & 3 deletions docs/src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ While Kotlin and Godot supports a wide range of platforms, this module for the m

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

Full version: `0.13.1-4.4.1`
Full version: `0.14.0-4.5`

Module Version: `0.13.1`
Module Version: `0.14.0`

Supported Godot Version: `4.4.1`
Supported Godot Version: `4.5`

This module relies on a Kotlin *compiler plugin* for registering your classes and members to Godot. As the compiler API from Kotlin is not stable yet, at the moment we can only support specific Kotlin version per release.

Expand Down
45 changes: 0 additions & 45 deletions harness/tests/.gut_editor_config.json

This file was deleted.

17 changes: 0 additions & 17 deletions harness/tests/.gut_editor_shortcuts.cfg

This file was deleted.

Loading