Merge pull request #446 from Tencent/dev

prepare v1.1.1

Android/MMKV/build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.61'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
         classpath 'digital.wup:android-maven-publish:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

Android/MMKV/gradle.properties

@@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME_PREFIX=1.1.0
+VERSION_NAME_PREFIX=1.1.1
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=

Android/MMKV/mmkvdemo/build.gradle

@@ -16,7 +16,7 @@ android {
     defaultConfig {
         applicationId "com.tencent.mmkvdemo"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -63,8 +63,8 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    implementation project(':mmkv')
-//    implementation 'com.tencent:mmkv:1.1.0'
-    implementation 'com.tencent:mmkv-static:1.1.0'
+//    implementation 'com.tencent:mmkv:1.1.1'
+    implementation 'com.tencent:mmkv-static:1.1.1'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'

CHANGELOG.md

@@ -1,5 +1,22 @@
 # MMKV Change Log
 
+## v1.1.1 / 2020-04-13
+
+### iOS / macOS
+
+* Support WatchOS.
+* Rename `+[MMKV onExit]` to `+[MMKV onAppTerminate]`, to avoid naming conflict with some other OpenSource projects.
+* Make background write protection much more robust, fix a potential crash when writing meta info in background.
+* Fix a potential data corruption bug when writing a UTF-8 (non-ASCII) key.
+
+### Android
+
+* Fix a crash in the demo project when the App is hot reloaded.
+* Improve wiki & readme to recommend users to init & destruct MMKV in the `Application` class instead of on the `MainActivity` class.
+
+### POSIX
+* Fix two compile errors with some compilers.
+
 ## v1.1.0 / 2020-03-24
 This is the first **major breaking version** ever since MMKV was made public in September 2018, introducing bunches of improvement. Due to the Covid-19, it has been delayed for about a month. Now it's finally here! 
 

Core/CMakeLists.txt

@@ -71,7 +71,6 @@ add_library(core
         CodedInputData_OSX.cpp
         CodedOutputData.h
         CodedOutputData.cpp
-        CodedOutputData_OSX.cpp
         PBUtility.h
         PBUtility.cpp
         MiniPBCoder.h

Core/CodedInputData.cpp

@@ -22,11 +22,11 @@
 #include "PBUtility.h"
 #include <stdexcept>
 
-#ifdef MMKV_IOS_OR_MAC
+#ifdef MMKV_APPLE
 #    if __has_feature(objc_arc)
 #        error This file must be compiled with MRC. Use -fno-objc-arc flag.
 #    endif
-#endif // MMKV_IOS_OR_MAC
+#endif // MMKV_APPLE
 
 using namespace std;
 
@@ -79,7 +79,7 @@ bool CodedInputData::readBool() {
     return this->readRawVarint32() != 0;
 }
 
-#ifndef MMKV_IOS_OR_MAC
+#ifndef MMKV_APPLE
 
 string CodedInputData::readString() {
     int32_t size = readRawVarint32();
@@ -181,7 +181,7 @@ int8_t CodedInputData::readRawByte() {
     return bytes[m_position++];
 }
 
-#ifdef MMKV_IOS_OR_MAC
-#endif // MMKV_IOS_OR_MAC
+#ifdef MMKV_APPLE
+#endif // MMKV_APPLE
 
 } // namespace mmkv

Core/CodedInputData.h

@@ -66,7 +66,7 @@ class CodedInputData {
 
     MMBuffer readData();
 
-#ifndef MMKV_IOS_OR_MAC
+#ifndef MMKV_APPLE
     std::string readString();
 #else
     NSString *readString();

Core/CodedInputData_OSX.cpp

@@ -20,7 +20,7 @@
 
 #include "CodedInputData.h"
 
-#ifdef MMKV_IOS_OR_MAC
+#ifdef MMKV_APPLE
 
 #    include "PBUtility.h"
 #    include <stdexcept>
@@ -68,4 +68,4 @@ NSData *CodedInputData::readNSData() {
 
 } // namespace mmkv
 
-#endif // MMKV_IOS_OR_MAC
+#endif // MMKV_APPLE

Core/CodedOutputData.cpp

@@ -23,11 +23,11 @@
 #include <cstring>
 #include <stdexcept>
 
-#ifdef MMKV_IOS_OR_MAC
+#ifdef MMKV_APPLE
 #    if __has_feature(objc_arc)
 #        error This file must be compiled with MRC. Use -fno-objc-arc flag.
 #    endif
-#endif // MMKV_IOS_OR_MAC
+#endif // MMKV_APPLE
 
 using namespace std;
 
@@ -78,7 +78,7 @@ void CodedOutputData::writeData(const MMBuffer &value) {
     this->writeRawData(value);
 }
 
-#ifndef MMKV_IOS_OR_MAC
+#ifndef MMKV_APPLE
 
 void CodedOutputData::writeString(const string &value) {
     size_t numberOfBytes = value.size();
@@ -92,7 +92,7 @@ void CodedOutputData::writeString(const string &value) {
     m_position += numberOfBytes;
 }
 
-#endif // MMKV_IOS_OR_MAC
+#endif // MMKV_APPLE
 
 size_t CodedOutputData::spaceLeft() {
     if (m_size <= m_position) {

Core/CodedOutputData.h

@@ -72,10 +72,8 @@ class CodedOutputData {
 
     void writeData(const MMBuffer &value);
 
-#ifndef MMKV_IOS_OR_MAC
+#ifndef MMKV_APPLE
     void writeString(const std::string &value);
-#else
-    void writeString(__unsafe_unretained NSString *value);
 #endif
 };