From 70dbb69b8c2d432ed378d5399243590f8d30a1c4 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Wed, 30 Dec 2020 17:57:16 +0100 Subject: [PATCH] iOS: Version 1.15.0-release --- CMakeLists.txt | 2 +- build/android/app/build.gradle | 8 ++++---- build/android/native/build.gradle | 4 ++-- build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 8 ++++---- build/iOS/deps/libcurl.sh | 2 +- src/config.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c862ee1d..e2b33549 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,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 14) +set(VERSION_MINOR 15) set(VERSION_PATCH 0) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index e2bed77b..ffd60ae6 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 - buildToolsVersion '30.0.2' - ndkVersion '21.3.6528147' + buildToolsVersion '30.0.3' + ndkVersion '22.0.7026061' defaultConfig { applicationId 'com.multicraft.game' minSdkVersion 16 //noinspection OldTargetApi targetSdkVersion 29 - versionCode 116 - versionName "1.14.0" + versionCode 124 + versionName "1.15.0" multiDexEnabled true } diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle index ab422d62..6673e4af 100644 --- a/build/android/native/build.gradle +++ b/build/android/native/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 29 - buildToolsVersion '30.0.2' - ndkVersion '21.3.6528147' + buildToolsVersion '30.0.3' + ndkVersion '22.0.7026061' defaultConfig { minSdkVersion 16 //noinspection OldTargetApi diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 1ce07fce..3461942d 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1834,7 +1834,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 113; + CURRENT_PROJECT_VERSION = 115; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1866,7 +1866,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.14.3; + MARKETING_VERSION = 1.15.0; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1900,7 +1900,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 113; + CURRENT_PROJECT_VERSION = 115; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1933,7 +1933,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.14.3; + MARKETING_VERSION = 1.15.0; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/build/iOS/deps/libcurl.sh b/build/iOS/deps/libcurl.sh index 754c2913..7d1d5ecd 100755 --- a/build/iOS/deps/libcurl.sh +++ b/build/iOS/deps/libcurl.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -CURL_VERSION=7.73.0 +CURL_VERSION=7.74.0 if [ ! -d libcurl-src ]; then wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz diff --git a/src/config.h b/src/config.h index bd5ea5cc..2d9dbe7b 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,7 @@ #define PROJECT_NAME_C "MultiCraft" #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 - #define VERSION_MINOR 14 + #define VERSION_MINOR 15 #define VERSION_PATCH 0 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif