Merge pull request Tencent#561 from Tencent/dev

for v.1.2.5
wxh841969240 · Nov 13, 2020 · cd02c53 · cd02c53
2 parents c0af2c8 + 5dc0d8f
commit cd02c53
Show file tree

Hide file tree

Showing 112 changed files with 4,650 additions and 91 deletions.
diff --git a/Android/MMKV/gradle.properties b/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.2.4
+VERSION_NAME_PREFIX=1.2.5
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=
diff --git a/Android/MMKV/mmkv/CMakeLists.txt b/Android/MMKV/mmkv/CMakeLists.txt
@@ -12,17 +12,14 @@ cmake_minimum_required(VERSION 3.8.0)
 
 add_subdirectory(../../../Core Core)
 
-#enable_language(ASM)
-#
-#add_subdirectory(../../../Core/aes/openssl aes)
-
 add_library( mmkv
 
              # Sets the library as a shared library.
              SHARED
 
              # Provides a relative path to your source file(s).
              src/main/cpp/native-bridge.cpp
+             src/main/cpp/flutter-bridge.cpp
         )
 
 set_target_properties(mmkv PROPERTIES

diff --git a/Android/MMKV/mmkv/build.gradle b/Android/MMKV/mmkv/build.gradle
@@ -1,8 +1,10 @@
 apply from: rootProject.file('gradle/build_library.gradle')
 
 android {
-//    defaultPublishConfig "StaticCppRelease"
-    defaultPublishConfig "SharedCppRelease"
+    defaultPublishConfig "StaticCppRelease"
+//    defaultPublishConfig "SharedCppRelease"
+//    defaultPublishConfig "FlutterRelease"
+
     defaultConfig {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
@@ -56,6 +58,16 @@ android {
                 }
             }
         }
+        /*Flutter {
+            dimension "stl_mode"
+            ext.artifactIdSuffix = 'flutter'
+            externalNativeBuild {
+                cmake {
+                    arguments = ["-DANDROID_STL=c++_static"]
+                    cppFlags += "-DFORCE_POSIX"
+                }
+            }
+        }*/
     }
 }