Version 1.7.1-release
parent
bcc87c0e30
commit
24d354767a
|
@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD 11)
|
|||
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
|
||||
set(VERSION_MAJOR 1)
|
||||
set(VERSION_MINOR 7)
|
||||
set(VERSION_PATCH 0)
|
||||
set(VERSION_PATCH 1)
|
||||
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
|
||||
|
||||
# Change to false for releases
|
||||
|
|
|
@ -6,8 +6,8 @@ android {
|
|||
applicationId 'com.multicraft.game'
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 29
|
||||
versionCode 34
|
||||
versionName "1.7.0"
|
||||
versionCode 35
|
||||
versionName "1.7.1"
|
||||
/*multiDexEnabled true
|
||||
useLibrary 'org.apache.http.legacy'*/
|
||||
}
|
||||
|
|
|
@ -1902,7 +1902,7 @@
|
|||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
CURRENT_PROJECT_VERSION = 79;
|
||||
CURRENT_PROJECT_VERSION = 80;
|
||||
DEVELOPMENT_TEAM = R3RLJ9TW52;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"$(inherited)",
|
||||
|
@ -1937,7 +1937,7 @@
|
|||
"@executable_path/Frameworks",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||
MARKETING_VERSION = 1.7.0;
|
||||
MARKETING_VERSION = 1.7.1;
|
||||
OTHER_CFLAGS = (
|
||||
"$(inherited)",
|
||||
"-isystem",
|
||||
|
@ -1968,7 +1968,7 @@
|
|||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
CURRENT_PROJECT_VERSION = 79;
|
||||
CURRENT_PROJECT_VERSION = 80;
|
||||
DEVELOPMENT_TEAM = R3RLJ9TW52;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"$(inherited)",
|
||||
|
@ -2004,7 +2004,7 @@
|
|||
"@executable_path/Frameworks",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||
MARKETING_VERSION = 1.7.0;
|
||||
MARKETING_VERSION = 1.7.1;
|
||||
OTHER_CFLAGS = (
|
||||
"$(inherited)",
|
||||
"-isystem",
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 42db4474c699cf3e75f581dd25db5fbab5b9c9c2
|
||||
Subproject commit 7090394c4141ad4e80898b6e470d9ab1d393b15e
|
|
@ -18,7 +18,7 @@
|
|||
#define STATIC_SHAREDIR ""
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 7
|
||||
#define VERSION_PATCH 0
|
||||
#define VERSION_PATCH 1
|
||||
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue