From e87c313187797167bb797e25f8ff9885d65f05a6 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Mon, 31 Aug 2020 12:44:31 +0200 Subject: [PATCH] Version 1.11.1-release --- CMakeLists.txt | 2 +- build/android/app/build.gradle | 8 ++++---- build/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- build/android/native/build.gradle | 2 +- build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 8 ++++---- src/config.h | 2 +- src/constants.h | 4 +--- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f533742..bc52eebb 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 11) -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 b79dcee0..e0bf6c0c 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.1' + buildToolsVersion '30.0.2' ndkVersion '21.3.6528147' defaultConfig { applicationId 'com.multicraft.game' minSdkVersion 16 //noinspection OldTargetApi targetSdkVersion 29 - versionCode 86 - versionName "1.11.0" + versionCode 88 + versionName "1.11.1" multiDexEnabled true } @@ -71,7 +71,7 @@ dependencies { //noinspection GradleDependency implementation 'commons-io:commons-io:2.5' implementation 'gun0912.ted:tedpermission-rx2:2.2.3' - implementation 'net.lingala.zip4j:zip4j:2.6.1' + implementation 'net.lingala.zip4j:zip4j:2.6.2' /* Analytics libraries */ //noinspection GradleDynamicVersion diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties index aa021e9b..2682ab85 100644 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ b/build/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 08 12:03:54 CEST 2020 +#Sun Aug 30 18:21:48 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle index ab35a307..1499778a 100644 --- a/build/android/native/build.gradle +++ b/build/android/native/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 29 - buildToolsVersion '30.0.1' + buildToolsVersion '30.0.2' ndkVersion '21.3.6528147' defaultConfig { minSdkVersion 16 diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index d273d501..8eca4348 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1808,7 +1808,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 96; + CURRENT_PROJECT_VERSION = 97; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1839,7 +1839,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.11.0; + MARKETING_VERSION = 1.11.1; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1873,7 +1873,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 96; + CURRENT_PROJECT_VERSION = 97; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1905,7 +1905,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.11.0; + MARKETING_VERSION = 1.11.1; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/src/config.h b/src/config.h index 0844b832..c38205f0 100644 --- a/src/config.h +++ b/src/config.h @@ -18,7 +18,7 @@ #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 #define VERSION_MINOR 11 - #define VERSION_PATCH 0 + #define VERSION_PATCH 1 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif diff --git a/src/constants.h b/src/constants.h index 7a377d42..862f81c1 100644 --- a/src/constants.h +++ b/src/constants.h @@ -111,9 +111,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // TODO: implement dpi-based scaling for windows and remove this hack #if defined(_WIN32) #define TTF_DEFAULT_FONT_SIZE (22) -#elif defined(__ANDROID__) -#define TTF_DEFAULT_FONT_SIZE (15) -#elif defined(__IOS__) +#elif defined(__ANDROID__) || defined(__IOS__) #define TTF_DEFAULT_FONT_SIZE (13) #else #define TTF_DEFAULT_FONT_SIZE (20)