Merge pull request #1231 from Tencent/dev

update flutter for v1.3.3
Tencent · Jan 25, 2024 · 4b23f9b · 4b23f9b
2 parents e19fda9 + 5b91436
commit 4b23f9b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -16,7 +16,7 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
-        mavenLocal()
+//        mavenLocal()
     }
 }
 

diff --git a/flutter/example/ios/Podfile.lock b/flutter/example/ios/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - Flutter (1.0.0)
-  - MMKV (1.3.2):
-    - MMKVCore (~> 1.3.2)
-  - MMKVCore (1.3.2)
-  - mmkvflutter (1.3.2):
+  - MMKV (1.3.3):
+    - MMKVCore (~> 1.3.3)
+  - MMKVCore (1.3.3)
+  - mmkvflutter (1.3.3):
     - Flutter
-    - MMKV (>= 1.3.2)
+    - MMKV (>= 1.3.3)
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -30,9 +30,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  MMKV: f21593c0af4b3f2a0ceb8f820f28bb639ea22bb7
-  MMKVCore: 31b4cb83f8266467eef20a35b6d78e409a11060d
-  mmkvflutter: 7261b5107a5d2c0ecfcefb6e80f3ac5d56372a3a
+  MMKV: f902fb6719da13c2ab0965233d8963a59416f911
+  MMKVCore: d26e4d3edd5cb8588c2569222cbd8be4231374e9
+  mmkvflutter: 348f009e4f527e4a0ff74894d469354cca2ad32f
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
 
 PODFILE CHECKSUM: 751e522a1d35e86af4f588d982f4a515941611c5

diff --git a/flutter/example/ios/Runner.xcodeproj/project.pbxproj b/flutter/example/ios/Runner.xcodeproj/project.pbxproj
@@ -50,6 +50,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B2C1AA8754382E0A720C38EA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		CB197414255EC4C900A776BE /* flutter-bridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "flutter-bridge.mm"; path = "../../../ios/Classes/flutter-bridge.mm"; sourceTree = "<group>"; };
+		CB8E67DC2B627D4100C6E2ED /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -115,6 +116,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				CB8E67DC2B627D4100C6E2ED /* Runner.entitlements */,
 				CB197414255EC4C900A776BE /* flutter-bridge.mm */,
 				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
 				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
@@ -360,6 +362,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 52LMU3A345;
 				ENABLE_BITCODE = NO;
@@ -498,6 +501,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 52LMU3A345;
 				ENABLE_BITCODE = NO;
@@ -531,6 +535,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 52LMU3A345;
 				ENABLE_BITCODE = NO;

diff --git a/flutter/example/ios/Runner/Runner.entitlements b/flutter/example/ios/Runner/Runner.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.lingol.mmkvdemo</string>
+	</array>
+</dict>
+</plist>
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
@@ -25,10 +25,19 @@ import "dart:typed_data";
 
 import "package:flutter/material.dart";
 import "package:mmkv/mmkv.dart";
+import "package:path_provider_foundation/path_provider_foundation.dart";
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  var groupDir = null;
+  if (Platform.isIOS) {
+    final PathProviderFoundation provider = PathProviderFoundation();
+    groupDir = await provider.getContainerPath(appGroupIdentifier: "group.com.lingol.mmkvdemo");
+  }
+
   // must wait for MMKV to finish initialization
-  final rootDir = await MMKV.initialize();
+  final rootDir = await MMKV.initialize(groupDir: groupDir);
   print("MMKV for flutter with rootDir = $rootDir");
 
   runApp(MyApp());