Merge pull request #1369 from Tencent/1.3.x_lts

1.3.x lts
Tencent · Jul 26, 2024 · cc8565b · cc8565b
2 parents 9fce6ea + e2b1e88
commit cc8565b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/Core/aes/AESCrypt.cpp b/Core/aes/AESCrypt.cpp
@@ -109,7 +109,7 @@ uint32_t AESCrypt::randomItemSizeHolder(uint32_t size) {
     auto ItemSizeHolderMax = ItemSizeHolders[size] - 1;
 
     srand((unsigned) time(nullptr));
-    auto result = static_cast<uint32_t>(random());
+    auto result = static_cast<uint32_t>(rand());
     result = result % (ItemSizeHolderMax - ItemSizeHolderMin + 1);
     result += ItemSizeHolderMin;
     return result;

diff --git a/flutter/mmkv/example/ios/Runner.xcodeproj/project.pbxproj b/flutter/mmkv/example/ios/Runner.xcodeproj/project.pbxproj
@@ -151,7 +151,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				F81C3C4D9ACCDFF72C008BDF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -168,7 +167,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -262,23 +261,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
-		F81C3C4D9ACCDFF72C008BDF /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/flutter/mmkv/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/mmkv/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/flutter/mmkv_android/android/build.gradle b/flutter/mmkv_android/android/build.gradle
@@ -34,6 +34,6 @@ android {
     }
 
     dependencies {
-        implementation 'com.tencent:mmkv:^1.3.9'
+        implementation 'com.tencent:mmkv:[1.3.9, 2.0)'
     }
 }
diff --git a/flutter/mmkv_ios/ios/mmkv_ios.podspec b/flutter/mmkv_ios/ios/mmkv_ios.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'MMKV', '~> 1.3.9'
+  s.dependency 'MMKV', '>= 1.3.9', '< 2.0'
   s.platform = :ios, '12.0'
 
 # Flutter.framework does not contain a i386 slice.