Merge pull request #1341 from Tencent/dev

ignore Podfile.lock
Tencent · Jul 5, 2024 · 2d5f5b3 · 2d5f5b3
2 parents 9a2f47c + 0165c1b
commit 2d5f5b3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ dist/
 .cxx
 
 pubspec.lock
+Podfile.lock
diff --git a/Android/MMKV/mmkvdemo/build.gradle b/Android/MMKV/mmkvdemo/build.gradle
@@ -76,8 +76,8 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-//    implementation project(':mmkv')
-    implementation 'com.tencent:mmkv:1.3.6'
+    implementation project(':mmkv')
+//    implementation 'com.tencent:mmkv:1.3.6'
 //    implementation 'com.tencent:mmkv-static:1.3.6' // this is identical to 'com.tencent:mmkv'
 //    implementation 'com.tencent:mmkv-shared:1.3.6'
     implementation 'androidx.appcompat:appcompat:1.6.1'

diff --git a/flutter/mmkv/example/ios/Podfile.lock b/flutter/mmkv/example/ios/Podfile.lock
diff --git a/flutter/mmkv/example/ios/Runner.xcodeproj/project.pbxproj b/flutter/mmkv/example/ios/Runner.xcodeproj/project.pbxproj
@@ -170,7 +170,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

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 = "1510"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,3 +53,4 @@ dist/
		.cxx

		pubspec.lock
		Podfile.lock