From 24d354767afc03b54bd93cfc67b19e8d6d3da240 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Fri, 27 Dec 2019 22:30:17 +0100 Subject: [PATCH] Version 1.7.1-release --- CMakeLists.txt | 2 +- build/android/app/build.gradle | 4 ++-- build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 8 ++++---- games/default | 2 +- src/config.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd8127c2..12a2c4b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index 73fe10cc..e5013e24 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -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'*/ } diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 1fa137d4..3f441480 100755 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -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", diff --git a/games/default b/games/default index 42db4474..7090394c 160000 --- a/games/default +++ b/games/default @@ -1 +1 @@ -Subproject commit 42db4474c699cf3e75f581dd25db5fbab5b9c9c2 +Subproject commit 7090394c4141ad4e80898b6e470d9ab1d393b15e diff --git a/src/config.h b/src/config.h index 97aa816d..0ff9f288 100644 --- a/src/config.h +++ b/src/config.h @@ -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