Bump up to v1.1.0 (redis-5.0.0)

CHANGELOGS.md

@@ -1,52 +1,45 @@
 Redis on Android 1.0 release notes
 ====================================
 
-================================================================================
-Redis on Android 1.0.8     Released Aug/6/2018 9:43 PDT
-================================================================================
+## Redis on Android 1.1.0
+  - Released Aug/6/2018 9:43 PDT
+  - Upgrade Redis v5.0.0
 
-Upgrade the redis 4.0.11
+## Redis on Android 1.0.8
+  - Released Aug/6/2018 9:43 PDT
+  - Upgrade Redis 4.0.11
 
-================================================================================
-Redis on Android 1.0.7     Released Jul/2/2018 10:42 PDT
-================================================================================
+## Redis on Android 1.0.8
+  - Released Aug/6/2018 9:43 PDT
+  - Upgrade Redis 4.0.11
 
-Upgrade the redis 4.0.10
+## Redis on Android 1.0.7
+  - Released Jul/2/2018 10:42 PDT
+  - Upgrade Redis 4.0.10
 
-================================================================================
-Redis on Android 1.0.6     Released Mar/30/2018 11:15 PDT
-================================================================================
+## Redis on Android 1.0.6
+  - Released Mar/30/2018 11:15 PDT
+  - Upgrade Redis 4.0.9
 
-Upgrade the redis 4.0.9
+## Redis on Android 1.0.5
+  - Released Feb/21/2018 17:47 PST
+  - (fix) `redis-check-aof`, `redis-check-rdb` commands do not work
 
-================================================================================
-Redis on Android 1.0.5     Released Feb/21/2018 17:47 PST
-================================================================================
+## Redis on Android 1.0.4
+  - Released Feb/13/2018 15:32 PST
+  - Upgrade Redis 4.0.8
 
-(fix) `redis-check-aof`, `redis-check-rdb` commands do not work
+## Redis on Android 1.0.3
+  - Released Jan/03/2018 17:10 PST
+  - (fix) Change the "wait3()" implementation
 
-================================================================================
-Redis on Android 1.0.4     Released Feb/13/2018 15:32 PST
-================================================================================
+## Redis on Android 1.0.2
 
-Upgrade the redis 4.0.8
+  - (fix) Error message "wait3() returned an error: No child processes. rdb_child_pid = 25182, aof_child_pid = -1"
 
-================================================================================
-Redis on Android 1.0.3     Released Jan/03/2018 17:10 PST
-================================================================================
+## Redis on Android 1.0.1
+  - Released Dec/22/2017 15:30 PST
 
-(fix) Change the "wait3()" implementation
+  - (fix) Error message "wait3() returned an error: No child processes. rdb_child_pid = 25182, aof_child_pid = -1"
 
-================================================================================
-Redis on Android 1.0.2
-================================================================================
-
-(fix) Error message "wait3() returned an error: No child processes. rdb_child_pid = 25182, aof_child_pid = -1"
-
-================================================================================
-Redis on Android 1.0.1     Released Dec/22/2017 15:30 PST
-================================================================================
-
-(fix) Error message "wait3() returned an error: No child processes. rdb_child_pid = 25182, aof_child_pid = -1"
-
-(fix) `zfree(argv);` in network.c causes crash on some Android devices.
+  - (fix) `zfree(argv);` in network.c causes crash on some Android devices.

README.md

@@ -2,7 +2,7 @@
 
 ## Redis version
 
-Aug/6/2018  Redis 4.0.11
+Oct/25/2018  ** Redis 5.0.0**
 
 ## Description
 
@@ -55,7 +55,7 @@ repositories {
 }
 
 dependencies {
-    compile 'io.wf9a5m75:redis-android:1.0.8'
+    compile 'io.wf9a5m75:redis-android:1.1.0'
 }
 ```
 
@@ -168,3 +168,14 @@ OK
 ```
 
 ![](https://github.com/wf9a5m75/redis-android/blob/master/images/playing.gif?raw=true)
+
+# Version compatibles
+
+| Redis version | redis-android version |
+|---------------|-----------------------|
+| Redis 5.0.0   | v1.1.0                |
+| Redis 4.0.11  | v1.0.8                |
+| Redis 4.0.10  | v1.0.7                |
+| Redis 4.0.9   | v1.0.6                |
+| Redis 4.0.8   | v1.0.4 - v1.0.5       |
+| Redis 4.0.6   | v1.0.0 - v1.0.3       |

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 30 09:52:06 PDT 2018
+#Thu Oct 25 09:31:17 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

redis-android/build.gradle

@@ -4,15 +4,15 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 16
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
@@ -36,7 +36,7 @@ uploadArchives {
     repositories {
         mavenDeployer {
             repository url: "file://${repo.absolutePath}"
-            pom.version = "1.0.8"
+            pom.version = "1.1.0"
             pom.groupId = "io.wf9a5m75"
             pom.artifactId = "redis-android"
         }

redis-android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

redis-android/src/main/java/io/wf9a5m75/redis/RedisAndroid.java

@@ -72,20 +72,20 @@ public static void start(Context context, Bundle options) {
     //-------------------
     // Replication
     //-------------------
-    //configs.putString("slaveof", "no one");
+    //configs.putString("replicaof", "no one");
     //configs.putString("masterauth", "");
-    configs.putString("slave-serve-stale-data", "yes");
-    configs.putString("slave-read-only", "yes");
+    configs.putString("replica-serve-stale-data", "yes");
+    configs.putString("replica-read-only", "yes");
     configs.putString("repl-diskless-sync", "no");
     configs.putString("repl-diskless-sync-delay", "5");
-//    configs.putString("repl-ping-slave-period", "10");
+//    configs.putString("repl-ping-replica-period", "10");
 //    configs.putString("repl-timeout", "60");
     configs.putString("repl-disable-tcp-nodelay", "no");
 //    configs.putString("repl-backlog-size", "1mb");
 //    configs.putString("repl-backlog-ttl", "3600");
-    configs.putString("slave-priority", "100");
-//    configs.putString("slave-announce-ip", "5.5.5.5");
-//    configs.putString("slave-announce-port", "1234");
+    configs.putString("replica-priority", "100");
+//    configs.putString("replica-announce-ip", "5.5.5.5");
+//    configs.putString("replica-announce-port", "1234");
 
     //-------------------
     // Security
@@ -110,7 +110,7 @@ public static void start(Context context, Bundle options) {
     configs.putString("lazyfree-lazy-eviction", "no");
     configs.putString("lazyfree-lazy-expire", "no");
     configs.putString("lazyfree-lazy-server-del", "no");
-    configs.putString("slave-lazy-flush", "no");
+    configs.putString("replica-lazy-flush", "no");
 
     //-------------------
     // Append only mode
@@ -135,7 +135,7 @@ public static void start(Context context, Bundle options) {
 //    configs.putString("cluster-enabled", "no");
 //    configs.putString("cluster-config-file", "nodes-" + hashCode + ".conf");
 //    configs.putString("cluster-node-timeout", "15000");
-//    configs.putString("cluster-slave-validity-factor", "10");
+//    configs.putString("cluster-replica-validity-factor", "10");
 //    configs.putString("cluster-migration-barrier", "1");
 //    configs.putString("cluster-require-full-coverage", "yes");
 
@@ -177,7 +177,7 @@ public static void start(Context context, Bundle options) {
 
     ArrayList<String> clientOutputBufferLimits = new ArrayList<String>();
     clientOutputBufferLimits.add("normal 0 0 0");
-    clientOutputBufferLimits.add("slave 256mb 64mb 60");
+    clientOutputBufferLimits.add("replica 256mb 64mb 60");
     clientOutputBufferLimits.add("pubsub 32mb 8mb 60");
     configs.putStringArrayList("client-output-buffer-limit", clientOutputBufferLimits);
 

redis-android/src/main/jni/Application.mk

@@ -2,4 +2,4 @@
 #APP_CFLAGS := -fexceptions -std=c11
 APP_PLATFORM := android-16
 APP_PIE := true
-#APP_ABI := armeabi-v7a
+#APP_ABI := armeabi-v7a

redis-android/src/main/jni/lua/_Android.mk

@@ -0,0 +1,33 @@
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := lua
+LOCAL_CFLAGS := -O2  -D__ANDROID__
+
+# To get ARM stack traces if Redis crashes we need a special C flag.
+LOCAL_CFLAGS += -funwind-tables
+
+
+SRC := $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES += $(SRC)
+LOCAL_CFLAGS += -I$(SRC)
+
+LOCAL_SRC_FILES += \
+  $(SRC)/fpconv.c $(SRC)/lapi.c $(SRC)/lauxlib.c $(SRC)/lbaselib.c $(SRC)/lcode.c \
+  $(SRC)/ldblib.c $(SRC)/ldebug.c $(SRC)/ldo.c \
+  $(SRC)/ldump.c $(SRC)/lfunc.c $(SRC)/lgc.c $(SRC)/linit.c $(SRC)/liolib.c \
+  $(SRC)/llex.c $(SRC)/lmathlib.c $(SRC)/lmem.c $(SRC)/loadlib.c \
+  $(SRC)/lobject.c $(SRC)/lopcodes.c $(SRC)/loslib.c $(SRC)/lparser.c \
+  $(SRC)/lstate.c $(SRC)/lstring.c $(SRC)/lstrlib.c $(SRC)/ltable.c $(SRC)/ltablib.c \
+  $(SRC)/ltm.c $(SRC)/lua.c $(SRC)/lua_bit.c $(SRC)/lua_cjson.c \
+  $(SRC)/lua_cmsgpack.c $(SRC)/lua_struct.c $(SRC)/luac.c $(SRC)/lundump.c $(SRC)/lvm.c \
+  $(SRC)/lzio.c $(SRC)/print.c $(SRC)/strbuf.c
+
+
+# Allow to use the header files from external library.
+# http://serenegiant.com/blog/?p=2119
+LOCAL_EXPORT_C_INCLUDES := $(SRC)
+
+include $(BUILD_STATIC_LIBRARY)

redis-android/src/main/jni/redis-4.0.11/deps/lua/src/lua_cjson.c → redis-android/src/main/jni/lua/src/lua_cjson.c

@@ -46,7 +46,7 @@
 #include "strbuf.h"
 #include "fpconv.h"
 
-#include "../../../src/solarisfixes.h"
+#include "../redis-5.0.0/src/solarisfixes.h"
 
 #ifndef CJSON_MODNAME
 #define CJSON_MODNAME   "cjson"