diff --git a/CMakeLists.txt b/CMakeLists.txt index 82548dec..0717b432 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 15) -set(VERSION_PATCH 0) +set(VERSION_PATCH 2) 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 ffd60ae6..442bc866 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -8,8 +8,8 @@ android { minSdkVersion 16 //noinspection OldTargetApi targetSdkVersion 29 - versionCode 124 - versionName "1.15.0" + versionCode 135 + versionName "1.15.1" multiDexEnabled true } diff --git a/build/android/build.gradle b/build/android/build.gradle index 92b645d3..bc053af4 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' //noinspection GradleDynamicVersion /*classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+'*/ classpath 'de.undercouch:gradle-download-task:4.1.1' diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties index 0def0626..4bea75d3 100644 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ b/build/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 02 22:19:11 CET 2020 +#Sat Feb 06 00:00:38 CET 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index a88c5a12..5186733b 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1858,7 +1858,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 117; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1890,7 +1890,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.15.0; + MARKETING_VERSION = 1.15.2; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1924,7 +1924,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 117; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1957,7 +1957,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.15.0; + MARKETING_VERSION = 1.15.2; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -2013,7 +2013,7 @@ repositoryURL = "https://github.com/bugsnag/bugsnag-cocoa"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 6.4.0; + minimumVersion = 6.6.0; }; }; 84C32A3524AF7A4500445E92 /* XCRemoteSwiftPackageReference "Nantes" */ = { diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg index d8b3902c..0fc97d6a 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg differ diff --git a/build/iOS/Podfile b/build/iOS/Podfile index fd55e55c..3e4da592 100755 --- a/build/iOS/Podfile +++ b/build/iOS/Podfile @@ -6,14 +6,14 @@ install! 'cocoapods', :warn_for_multiple_pod_sources => false, :warn_for_unused_ def appodeal # source 'https://github.com/appodeal/CocoaPods.git' - ver = '2.8.1.1' # '2.7.5.1' + ver = '2.9.0-Beta' pod 'APDAdColonyAdapter', ver pod 'APDAppLovinAdapter', ver # We don't use all of these networks, but they are part of BidMachine and we can't exclude only FB otherwise - pod 'APDBidMachineAdapter', ver, :subspecs => ['Tapjoy', 'AdColony', 'Amazon', 'Criteo', 'MyTarget', 'Smaato', 'Vungle', 'AppRoll'] -# pod 'APDAppodealAdExchangeAdapter', ver + pod 'APDBidMachineAdapter', ver, :subspecs => ['Tapjoy', 'AdColony', 'Criteo', 'MyTarget', 'Smaato', 'Vungle', 'AppRoll'] pod 'APDIronSourceAdapter', ver + pod 'APDMintegralAdapter', ver pod 'APDTapjoyAdapter', ver pod 'APDUnityAdapter', ver end diff --git a/build/iOS/deps/libcurl.sh b/build/iOS/deps/libcurl.sh index 7d1d5ecd..a2fc1bfc 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.74.0 +CURL_VERSION=7.75.0 if [ ! -d libcurl-src ]; then wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz diff --git a/build/iOS/deps/openal.sh b/build/iOS/deps/openal.sh index 7cb18430..b3078944 100755 --- a/build/iOS/deps/openal.sh +++ b/build/iOS/deps/openal.sh @@ -1,13 +1,13 @@ #!/bin/bash -e . sdk.sh -OPENAL_VERSION=1.21.0 +OPENAL_VERSION=1.21.1 if [ ! -d openal-src ]; then - wget https://github.com/kcat/openal-soft/archive/openal-soft-$OPENAL_VERSION.tar.gz - tar -xzvf openal-soft-$OPENAL_VERSION.tar.gz - mv openal-soft-openal-soft-$OPENAL_VERSION openal-src - rm openal-soft-$OPENAL_VERSION.tar.gz + wget https://github.com/kcat/openal-soft/archive/$OPENAL_VERSION.tar.gz + tar -xzvf $OPENAL_VERSION.tar.gz + mv openal-soft-$OPENAL_VERSION openal-src + rm $OPENAL_VERSION.tar.gz fi cd openal-src diff --git a/src/config.h b/src/config.h index 2d9dbe7b..b5ad11c7 100644 --- a/src/config.h +++ b/src/config.h @@ -18,7 +18,7 @@ #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 #define VERSION_MINOR 15 - #define VERSION_PATCH 0 + #define VERSION_PATCH 2 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif