Skip to content

Commit

Permalink
prepare for v1.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
lingol committed Dec 14, 2018
1 parent 116eb16 commit 2b7aa79
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Android/MMKV/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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.0.14
VERSION_NAME_PREFIX=1.0.15
#VERSION_NAME_SUFFIX=-SNAPSHOT
VERSION_NAME_SUFFIX=
3 changes: 1 addition & 2 deletions Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKV.java
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,7 @@ public <T extends Parcelable> T decodeParcelable(String key, Class<T> tClass) {
}

@SuppressWarnings("unchecked")
public <T extends Parcelable>
T decodeParcelable(String key, Class<T> tClass, T defaultValue) {
public <T extends Parcelable> T decodeParcelable(String key, Class<T> tClass, T defaultValue) {
if (tClass == null) {
return defaultValue;
}
Expand Down
6 changes: 3 additions & 3 deletions Android/MMKV/mmkvdemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ repositories {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':mmkv')
// implementation 'com.tencent:mmkv:1.0.14'
// implementation 'com.tencent:mmkv-static:1.0.14'
// implementation project(':mmkv')
implementation 'com.tencent:mmkv:1.0.15'
// implementation 'com.tencent:mmkv-static:1.0.15'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# MMKV Change Log

## v1.0.15 / 2018-12-13
### iOS / macOS
What's new

* Storing **NSString/NSData/NSDate** directly by calling `setString`/`getSring`, `setData`/`getData`, `setDate`/getDate`.
* Fix a potencial crash due to divided by zero.


### Android
What's new

* Fix a stack overflow crash due to the **callback** feature introduced by v1.0.13.
* Fix a potencial crash due to divided by zero.

### Win32
MMKV for Win32 in under construction. Hopefully will come out in next release. For those who are interested, check out branch `dev_win32` for the latest development.

## v1.0.14 / 2018-11-30
### iOS / macOS
What's new
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls)
[![Release Version](https://img.shields.io/badge/release-1.0.14-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
[![Release Version](https://img.shields.io/badge/release-1.0.15-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
[![Platform](https://img.shields.io/badge/Platform-%20iOS%20%7C%20Android-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home)

中文版本请参看[这里](./readme_cn.md)
Expand Down Expand Up @@ -75,8 +75,8 @@ Add the following lines to `build.gradle` on your app module:
```gradle
dependencies {
implementation 'com.tencent:mmkv:1.0.14'
// replace "1.0.14" with any available version
implementation 'com.tencent:mmkv:1.0.15'
// replace "1.0.15" with any available version
}
```

Expand Down
2 changes: 1 addition & 1 deletion iOS/MMKV/MMKV/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.14</string>
<string>1.0.15</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 2 additions & 2 deletions readme_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ NSString *str = [mmkv getObjectOfClass:NSString.class forKey:@"string"];
```gradle
dependencies {
implementation 'com.tencent:mmkv:1.0.14'
// replace "1.0.14" with any available version
implementation 'com.tencent:mmkv:1.0.15'
// replace "1.0.15" with any available version
}
```

Expand Down

0 comments on commit 2b7aa79

Please sign in to comment.