From 529a55bab279f6cdd422dd24b4a5110c286c0392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 5 Jul 2023 22:09:59 +0200 Subject: [PATCH] Bump version to 4.1.1-rc --- .github/workflows/android_builds.yml | 2 +- .github/workflows/ios_builds.yml | 2 +- .github/workflows/linux_builds.yml | 2 +- .github/workflows/macos_builds.yml | 2 +- .github/workflows/web_builds.yml | 2 +- .github/workflows/windows_builds.yml | 2 +- misc/dist/macos_tools.app/Contents/Info.plist | 4 ++-- misc/dist/windows/godot.iss | 2 +- .../editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj | 2 +- .../Godot.SourceGenerators/Godot.SourceGenerators.csproj | 2 +- modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj | 2 +- .../glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj | 2 +- version.py | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index afc73a462fd..74f73e98789 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index 63ecabd9577..c1ed4009cad 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index aef8f83a53e..04bee5169fb 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key, and godot-cpp checkout. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 6e0fbbf461b..7b326bb34b9 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index 2ae238caa6c..61f836189f7 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no EM_VERSION: 3.1.18 EM_CACHE_FOLDER: "emsdk-cache" diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 182ae2fc8c4..72ef9a31ea3 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -6,7 +6,7 @@ on: # SCONS_CACHE for windows must be set in the build environment env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: master + GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes SCONS_CACHE_MSVC_CONFIG: true diff --git a/misc/dist/macos_tools.app/Contents/Info.plist b/misc/dist/macos_tools.app/Contents/Info.plist index bff5743e15c..48f3bb0140f 100644 --- a/misc/dist/macos_tools.app/Contents/Info.plist +++ b/misc/dist/macos_tools.app/Contents/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.1 + 4.1.1 CFBundleSignature godot CFBundleVersion - 4.1 + 4.1.1 NSMicrophoneUsageDescription Microphone access is required to capture audio. NSCameraUsageDescription diff --git a/misc/dist/windows/godot.iss b/misc/dist/windows/godot.iss index 819327000c4..59adba08402 100644 --- a/misc/dist/windows/godot.iss +++ b/misc/dist/windows/godot.iss @@ -1,5 +1,5 @@ #define MyAppName "Godot Engine" -#define MyAppVersion "4.1" +#define MyAppVersion "4.1.1" #define MyAppPublisher "Godot Engine contributors" #define MyAppURL "https://godotengine.org/" #define MyAppExeName "godot.exe" diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj index e8ad6a77eac..1837f71ecb3 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj @@ -7,7 +7,7 @@ Godot Engine contributors Godot.NET.Sdk - 4.1.0 + 4.1.1 $(PackageVersion_Godot_NET_Sdk) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk $(RepositoryUrl) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj index 2557b70e75f..e720be5498b 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj @@ -9,7 +9,7 @@ Godot Engine contributors Godot.SourceGenerators - 4.1.0 + 4.1.1 $(PackageVersion_Godot_SourceGenerators) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index 16820e363a2..bfd57d98561 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -20,7 +20,7 @@ Godot Engine contributors GodotSharp - 4.1.0 + 4.1.1 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index c249ebf804e..d9d540b68ed 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -15,7 +15,7 @@ Godot Engine contributors GodotSharpEditor - 4.1.0 + 4.1.1 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor $(RepositoryUrl) diff --git a/version.py b/version.py index 281cd11eace..12b2c875c5b 100644 --- a/version.py +++ b/version.py @@ -2,8 +2,8 @@ short_name = "godot" name = "Godot Engine" major = 4 minor = 1 -patch = 0 -status = "stable" +patch = 1 +status = "rc" module_config = "" year = 2023 website = "https://godotengine.org"