Merge pull request #801 from WhiteCloud0123/develop

指定版本为9.6
WhiteCloud0123 · Sep 7, 2024 · 8b53258 · 8b53258
2 parents 09c8d6d + 109acbe
commit 8b53258
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -136,7 +136,7 @@ export CCACHE_COMMENTS=1
 # Explicitly let 'char' to be 'signed char' to fix #18776
 OTHERS += -fsigned-char
 
-VERSION = CDDA-Breeze-9.5
+VERSION = CDDA-Breeze-9.6
 
 TARGET_NAME = cataclysm
 TILES_TARGET_NAME = $(TARGET_NAME)-tiles

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -245,8 +245,8 @@ android {
  defaultConfig {
  minSdkVersion override_minSdkVersion
  targetSdkVersion override_targetSdkVersion
- versionCode 75
- versionName "9.5"
+ versionCode 76
+ versionName "9.6"
  if (buildAsApplication) {
  applicationId "WhiteCloud.CDDA_Breeze"
  setProperty("archivesBaseName", "CDDA-Breeze-" + versionName)

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -46,7 +46,7 @@ deps=./deps.zip
 
 # This property controls which override version number to use
 # You can override this from the command line by passing "-Poverride_version=#"
-override_version=CDDA-Breeze-9.5
+override_version=CDDA-Breeze-9.6
 
 # This property controls path where overridden version number header should be generated
 # You can override this from the command line by passing "-Pversion_header_path=#"

diff --git a/src/version.cpp b/src/version.cpp
@@ -3,7 +3,7 @@
 #if (defined(_WIN32) || defined(MINGW)) && !defined(GIT_VERSION) && !defined(CROSS_LINUX) && !defined(_MSC_VER)
 
 #ifndef VERSION
-#define VERSION "CDDA-Breeze 9.5"
+#define VERSION "CDDA-Breeze 9.6"
 #endif
 
 #else

diff --git a/src/version.h b/src/version.h
@@ -1,2 +1,2 @@
 // NOLINT(cata-header-guard)
-#define VERSION "CDDA-Breeze-9.5"
+#define VERSION "CDDA-Breeze-9.6"