From d7310af1259b44717d2823d9cfebda166cb7e33c Mon Sep 17 00:00:00 2001 From: guoling Date: Mon, 5 Feb 2024 19:58:21 +0800 Subject: [PATCH 01/10] include for unlink() #1233 --- Core/MMKV_IO.cpp | 4 ++++ Core/MemoryFile.cpp | 1 + Core/MemoryFile_OSX.cpp | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Core/MMKV_IO.cpp b/Core/MMKV_IO.cpp index 02588edf..696b7399 100755 --- a/Core/MMKV_IO.cpp +++ b/Core/MMKV_IO.cpp @@ -49,6 +49,10 @@ # endif #endif // MMKV_APPLE +#ifndef MMKV_WIN32 +# include +#endif + using namespace std; using namespace mmkv; using KVHolderRet_t = std::pair; diff --git a/Core/MemoryFile.cpp b/Core/MemoryFile.cpp index 42c78374..3877ecfb 100644 --- a/Core/MemoryFile.cpp +++ b/Core/MemoryFile.cpp @@ -35,6 +35,7 @@ # include # include # include +# include using namespace std; diff --git a/Core/MemoryFile_OSX.cpp b/Core/MemoryFile_OSX.cpp index d45b5af2..fa65b0e7 100644 --- a/Core/MemoryFile_OSX.cpp +++ b/Core/MemoryFile_OSX.cpp @@ -53,6 +53,7 @@ void tryResetFileProtection(const string &path) { #ifdef MMKV_APPLE #include +#include namespace mmkv { @@ -77,7 +78,7 @@ bool tryAtomicRename(const char *src, const char *dst) { } } - unlink(src); + ::unlink(src); return true; } From a740f2e84a61110d6b6acced7c2c810a61e71f1f Mon Sep 17 00:00:00 2001 From: Cyril Bonaccini Date: Thu, 15 Feb 2024 18:08:14 +0100 Subject: [PATCH 02/10] chore: add MMKVDemo to workspace --- MMKV.xcworkspace/contents.xcworkspacedata | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MMKV.xcworkspace/contents.xcworkspacedata b/MMKV.xcworkspace/contents.xcworkspacedata index c63f0dba..289afc57 100644 --- a/MMKV.xcworkspace/contents.xcworkspacedata +++ b/MMKV.xcworkspace/contents.xcworkspacedata @@ -1,6 +1,9 @@ + + From d63393b36c03f83e334590ddf8b7c27eb8ded1fe Mon Sep 17 00:00:00 2001 From: Cyril Bonaccini Date: Fri, 16 Feb 2024 09:12:19 +0100 Subject: [PATCH 03/10] chore: add VisionDemo target --- .../MMKVDemo.xcodeproj/project.pbxproj | 173 ++++++++++++++++++ .../Content.imageset/Contents.json | 12 ++ .../Back.solidimagestacklayer/Contents.json | 6 + .../AppIcon.solidimagestack/Contents.json | 17 ++ .../Content.imageset/Contents.json | 12 ++ .../Front.solidimagestacklayer/Contents.json | 6 + .../Content.imageset/Contents.json | 12 ++ .../Middle.solidimagestacklayer/Contents.json | 6 + .../Assets.xcassets/Contents.json | 6 + iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift | 23 +++ iOS/MMKVDemo/MMKVVisionDemo/Info.plist | 15 ++ .../MMKVVisionDemo/MMKVVisionDemoApp.swift | 18 ++ .../Preview Assets.xcassets/Contents.json | 6 + 13 files changed, 312 insertions(+) create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/Contents.json create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Info.plist create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift create mode 100644 iOS/MMKVDemo/MMKVVisionDemo/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/iOS/MMKVDemo/MMKVDemo.xcodeproj/project.pbxproj b/iOS/MMKVDemo/MMKVDemo.xcodeproj/project.pbxproj index a2b93a0a..eea0ab33 100644 --- a/iOS/MMKVDemo/MMKVDemo.xcodeproj/project.pbxproj +++ b/iOS/MMKVDemo/MMKVDemo.xcodeproj/project.pbxproj @@ -7,6 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 702CE6842B7E85070015E8A4 /* MMKV.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB36F25420F8A20C009AF46F /* MMKV.framework */; }; + 702CE6852B7E85070015E8A4 /* MMKV.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB36F25420F8A20C009AF46F /* MMKV.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 70A630972B7E7EC9003AB1DF /* MMKVVisionDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A630962B7E7EC9003AB1DF /* MMKVVisionDemoApp.swift */; }; + 70A630992B7E7EC9003AB1DF /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A630982B7E7EC9003AB1DF /* ContentView.swift */; }; + 70A6309B2B7E7ECA003AB1DF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 70A6309A2B7E7ECA003AB1DF /* Assets.xcassets */; }; + 70A6309E2B7E7ECA003AB1DF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 70A6309D2B7E7ECA003AB1DF /* Preview Assets.xcassets */; }; CB0DCC72242B57FC009AFE59 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD5359823B4718200D3A404 /* libc++.tbd */; }; CB1E0659242B8E3F00F2FD42 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CB1FD4D12046AF2300931B5F /* libz.tbd */; }; CB1E065F242B8E4A00F2FD42 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CB1E065E242B8E4A00F2FD42 /* libz.tbd */; }; @@ -142,6 +148,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 702CE6862B7E85070015E8A4 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 702CE6852B7E85070015E8A4 /* MMKV.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; CB3167162A4C6E380003221B /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -209,6 +226,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 702CE6802B7E84360015E8A4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/XROS.platform/Developer/SDKs/XROS1.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; + 70A630902B7E7EC9003AB1DF /* MMKVVisionDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MMKVVisionDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 70A630962B7E7EC9003AB1DF /* MMKVVisionDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMKVVisionDemoApp.swift; sourceTree = ""; }; + 70A630982B7E7EC9003AB1DF /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 70A6309A2B7E7ECA003AB1DF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 70A6309D2B7E7ECA003AB1DF /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 70A6309F2B7E7ECA003AB1DF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CB1E065E242B8E4A00F2FD42 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; CB1FD42020455E2D00931B5F /* MMKVDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MMKVDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; CB1FD42320455E2D00931B5F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -280,6 +304,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 70A6308D2B7E7EC9003AB1DF /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 702CE6842B7E85070015E8A4 /* MMKV.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CB1FD41D20455E2D00931B5F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -334,6 +366,26 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 70A630912B7E7EC9003AB1DF /* MMKVVisionDemo */ = { + isa = PBXGroup; + children = ( + 70A630962B7E7EC9003AB1DF /* MMKVVisionDemoApp.swift */, + 70A630982B7E7EC9003AB1DF /* ContentView.swift */, + 70A6309A2B7E7ECA003AB1DF /* Assets.xcassets */, + 70A6309F2B7E7ECA003AB1DF /* Info.plist */, + 70A6309C2B7E7ECA003AB1DF /* Preview Content */, + ); + path = MMKVVisionDemo; + sourceTree = ""; + }; + 70A6309C2B7E7ECA003AB1DF /* Preview Content */ = { + isa = PBXGroup; + children = ( + 70A6309D2B7E7ECA003AB1DF /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; CB1FD41720455E2D00931B5F = { isa = PBXGroup; children = ( @@ -345,6 +397,7 @@ CBF19013243D6F59001C82ED /* WatchApp */, CBF19022243D6F5A001C82ED /* WatchApp Extension */, CB3166FB2A4C6B5F0003221B /* kvdemo */, + 70A630912B7E7EC9003AB1DF /* MMKVVisionDemo */, CB1FD42120455E2D00931B5F /* Products */, CB1FD45720455F3500931B5F /* Frameworks */, ); @@ -361,6 +414,7 @@ CBF19012243D6F59001C82ED /* WatchApp.app */, CBF1901E243D6F5A001C82ED /* WatchApp Extension.appex */, CB3166FA2A4C6B5F0003221B /* kvdemo.app */, + 70A630902B7E7EC9003AB1DF /* MMKVVisionDemo.app */, ); name = Products; sourceTree = ""; @@ -390,6 +444,7 @@ isa = PBXGroup; children = ( CB1E065E242B8E4A00F2FD42 /* libz.tbd */, + 702CE6802B7E84360015E8A4 /* libz.tbd */, CBD5359823B4718200D3A404 /* libc++.tbd */, CB9C2732215E5ECC00448B6C /* libz.tbd */, CB1FD4D12046AF2300931B5F /* libz.tbd */, @@ -495,6 +550,26 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 70A6308F2B7E7EC9003AB1DF /* MMKVVisionDemo */ = { + isa = PBXNativeTarget; + buildConfigurationList = 70A630A32B7E7ECA003AB1DF /* Build configuration list for PBXNativeTarget "MMKVVisionDemo" */; + buildPhases = ( + 70A6308C2B7E7EC9003AB1DF /* Sources */, + 70A6308D2B7E7EC9003AB1DF /* Frameworks */, + 70A6308E2B7E7EC9003AB1DF /* Resources */, + 702CE6862B7E85070015E8A4 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MMKVVisionDemo; + packageProductDependencies = ( + ); + productName = MMKVVisionDemo; + productReference = 70A630902B7E7EC9003AB1DF /* MMKVVisionDemo.app */; + productType = "com.apple.product-type.application"; + }; CB1FD41F20455E2D00931B5F /* MMKVDemo */ = { isa = PBXNativeTarget; buildConfigurationList = CB1FD43620455E2D00931B5F /* Build configuration list for PBXNativeTarget "MMKVDemo" */; @@ -632,9 +707,14 @@ CB1FD41820455E2D00931B5F /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 1520; LastUpgradeCheck = 1200; ORGANIZATIONNAME = Lingol; TargetAttributes = { + 70A6308F2B7E7EC9003AB1DF = { + CreatedOnToolsVersion = 15.2; + ProvisioningStyle = Automatic; + }; CB1FD41F20455E2D00931B5F = { CreatedOnToolsVersion = 9.2; LastSwiftMigration = 1020; @@ -698,6 +778,7 @@ CBF19011243D6F59001C82ED /* WatchApp */, CBF1901D243D6F5A001C82ED /* WatchApp Extension */, CB3166F92A4C6B5F0003221B /* kvdemo */, + 70A6308F2B7E7EC9003AB1DF /* MMKVVisionDemo */, ); }; /* End PBXProject section */ @@ -734,6 +815,15 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 70A6308E2B7E7EC9003AB1DF /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 70A6309E2B7E7ECA003AB1DF /* Preview Assets.xcassets in Resources */, + 70A6309B2B7E7ECA003AB1DF /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CB1FD41E20455E2D00931B5F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -798,6 +888,15 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 70A6308C2B7E7EC9003AB1DF /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 70A630992B7E7EC9003AB1DF /* ContentView.swift in Sources */, + 70A630972B7E7EC9003AB1DF /* MMKVVisionDemoApp.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CB1FD41C20455E2D00931B5F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -963,6 +1062,71 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 70A630A02B7E7ECA003AB1DF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"MMKVVisionDemo/Preview Content\""; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.tencent.MMKVVisionDemo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = xros; + SUPPORTED_PLATFORMS = "xros xrsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + XROS_DEPLOYMENT_TARGET = 1.0; + }; + name = Debug; + }; + 70A630A12B7E7ECA003AB1DF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"MMKVVisionDemo/Preview Content\""; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.tencent.MMKVVisionDemo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = xros; + SUPPORTED_PLATFORMS = "xros xrsimulator"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,7"; + XROS_DEPLOYMENT_TARGET = 1.0; + }; + name = Release; + }; CB1FD43420455E2D00931B5F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1396,6 +1560,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 70A630A32B7E7ECA003AB1DF /* Build configuration list for PBXNativeTarget "MMKVVisionDemo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 70A630A02B7E7ECA003AB1DF /* Debug */, + 70A630A12B7E7ECA003AB1DF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; CB1FD41B20455E2D00931B5F /* Build configuration list for PBXProject "MMKVDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json new file mode 100644 index 00000000..04056a54 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "vision", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Contents.json new file mode 100644 index 00000000..950af4d8 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Contents.json @@ -0,0 +1,17 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "layers" : [ + { + "filename" : "Front.solidimagestacklayer" + }, + { + "filename" : "Middle.solidimagestacklayer" + }, + { + "filename" : "Back.solidimagestacklayer" + } + ] +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json new file mode 100644 index 00000000..04056a54 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "vision", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json new file mode 100644 index 00000000..04056a54 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "vision", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift b/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift new file mode 100644 index 00000000..f9a1ecc2 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift @@ -0,0 +1,23 @@ +// +// ContentView.swift +// MMKVVisionDemo +// +// Created by Cyril Bonaccini on 15/02/2024. +// Copyright © 2024 Lingol. All rights reserved. +// + +import SwiftUI +import MMKV + +struct ContentView: View { + var body: some View { + VStack { + Text("Hello, world!") + } + .padding() + } +} + +#Preview(windowStyle: .automatic) { + ContentView() +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Info.plist b/iOS/MMKVDemo/MMKVVisionDemo/Info.plist new file mode 100644 index 00000000..20f75e2a --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Info.plist @@ -0,0 +1,15 @@ + + + + + UIApplicationSceneManifest + + UIApplicationPreferredDefaultSceneSessionRole + UIWindowSceneSessionRoleApplication + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + + + diff --git a/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift b/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift new file mode 100644 index 00000000..f6a708c3 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift @@ -0,0 +1,18 @@ +// +// MMKVVisionDemoApp.swift +// MMKVVisionDemo +// +// Created by Cyril Bonaccini on 15/02/2024. +// Copyright © 2024 Lingol. All rights reserved. +// + +import SwiftUI + +@main +struct MMKVVisionDemoApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/iOS/MMKVDemo/MMKVVisionDemo/Preview Content/Preview Assets.xcassets/Contents.json b/iOS/MMKVDemo/MMKVVisionDemo/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/iOS/MMKVDemo/MMKVVisionDemo/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} From 76107d762c3974da116f0df72ba4099dfd3a55fd Mon Sep 17 00:00:00 2001 From: Cyril Bonaccini Date: Fri, 16 Feb 2024 09:21:23 +0100 Subject: [PATCH 04/10] chore: make MMKV visionos compatible --- Core/Core.xcodeproj/project.pbxproj | 6 ++++-- iOS/MMKV/MMKV.xcodeproj/project.pbxproj | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Core/Core.xcodeproj/project.pbxproj b/Core/Core.xcodeproj/project.pbxproj index 8eebcf47..01a19dc7 100644 --- a/Core/Core.xcodeproj/project.pbxproj +++ b/Core/Core.xcodeproj/project.pbxproj @@ -503,6 +503,7 @@ SDKROOT = iphoneos; TVOS_DEPLOYMENT_TARGET = 13.0; WATCHOS_DEPLOYMENT_TARGET = 4.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -559,6 +560,7 @@ TVOS_DEPLOYMENT_TARGET = 13.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; @@ -582,7 +584,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos"; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros"; TARGETED_DEVICE_FAMILY = "1,2,3"; }; name = Debug; @@ -608,7 +610,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos"; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos xrsimulator xros"; TARGETED_DEVICE_FAMILY = "1,2,3"; }; name = Release; diff --git a/iOS/MMKV/MMKV.xcodeproj/project.pbxproj b/iOS/MMKV/MMKV.xcodeproj/project.pbxproj index 89a806d9..409eeab8 100644 --- a/iOS/MMKV/MMKV.xcodeproj/project.pbxproj +++ b/iOS/MMKV/MMKV.xcodeproj/project.pbxproj @@ -747,7 +747,9 @@ PRODUCT_BUNDLE_IDENTIFIER = com.tencent.MMKV; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2,3"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + TARGETED_DEVICE_FAMILY = "1,2,3,7"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -784,7 +786,9 @@ PRODUCT_BUNDLE_IDENTIFIER = com.tencent.MMKV; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2,3"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + TARGETED_DEVICE_FAMILY = "1,2,3,7"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; From bc7d69acbe373477ea753c1112951d074000752a Mon Sep 17 00:00:00 2001 From: Cyril Bonaccini Date: Fri, 16 Feb 2024 09:22:37 +0100 Subject: [PATCH 05/10] test: add test in vision app --- iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift | 48 +++++++++++++++++++ .../MMKVVisionDemo/MMKVVisionDemoApp.swift | 4 ++ 2 files changed, 52 insertions(+) diff --git a/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift b/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift index f9a1ecc2..c23efad7 100644 --- a/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift +++ b/iOS/MMKVDemo/MMKVVisionDemo/ContentView.swift @@ -13,6 +13,54 @@ struct ContentView: View { var body: some View { VStack { Text("Hello, world!") + Button("Press Me") { + guard let mmkv = MMKV(mmapID: "testSwift", mode: MMKVMode.singleProcess) else { + return + } + + mmkv.set(true, forKey: "bool") + print("Swift: bool = \(mmkv.bool(forKey: "bool"))") + + mmkv.set(Int32(-1024), forKey: "int32") + print("Swift: int32 = \(mmkv.int32(forKey: "int32"))") + + mmkv.set(UInt32.max, forKey: "uint32") + print("Swift: uint32 = \(mmkv.uint32(forKey: "uint32"))") + + mmkv.set(Int64.min, forKey: "int64") + print("Swift: int64 = \(mmkv.int64(forKey: "int64"))") + + mmkv.set(UInt64.max, forKey: "uint64") + print("Swift: uint64 = \(mmkv.uint64(forKey: "uint64"))") + + mmkv.set(Float(-3.1415926), forKey: "float") + print("Swift: float = \(mmkv.float(forKey: "float"))") + + mmkv.set(Double.infinity, forKey: "double") + print("Swift: double = \(mmkv.double(forKey: "double"))") + + mmkv.set("Hello from Swift", forKey: "string") + print("Swift: string = \(mmkv.string(forKey: "string") ?? "")") + + mmkv.set(NSDate(), forKey: "date") + let date = mmkv.date(forKey: "date") + print("Swift: date = \(date?.description(with: .current) ?? "null")") + + mmkv.set("Hello from Swift".data(using: .utf8) ?? Data(), forKey: "data") + let data = mmkv.data(forKey: "data") + let str = String(data: data ?? Data(), encoding: .utf8) ?? "" + print("Swift: data = \(str)") + + let arr = [1, 0, 2, 4] + if let objArr = arr as NSArray? { + mmkv.set(objArr, forKey:"array") + let result = mmkv.object(of: NSArray.self, forKey: "array"); + print("Swift: array = \(result as! NSArray)") + } + + mmkv.removeValue(forKey: "bool") + print("Swift: after delete bool = \(mmkv.bool(forKey: "bool"))") + } } .padding() } diff --git a/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift b/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift index f6a708c3..ed06c414 100644 --- a/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift +++ b/iOS/MMKVDemo/MMKVVisionDemo/MMKVVisionDemoApp.swift @@ -7,9 +7,13 @@ // import SwiftUI +import MMKV @main struct MMKVVisionDemoApp: App { + init() { + MMKV.initialize(rootDir: nil) + } var body: some Scene { WindowGroup { ContentView() From 12edde5d2b09b45bdcba3275c8ca8e2d19a0dc02 Mon Sep 17 00:00:00 2001 From: Cyril Bonaccini Date: Fri, 16 Feb 2024 09:27:46 +0100 Subject: [PATCH 06/10] chore: add visionos support in podspec --- MMKV.podspec | 1 + MMKVCore.podspec | 1 + 2 files changed, 2 insertions(+) diff --git a/MMKV.podspec b/MMKV.podspec index 4fb771d3..040bbf89 100644 --- a/MMKV.podspec +++ b/MMKV.podspec @@ -17,6 +17,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = "11.0" s.osx.deployment_target = "10.13" s.tvos.deployment_target = "13.0" + s.visionos.deployment_target = "1.0" s.source = { :git => "https://github.com/Tencent/MMKV.git", :tag => "v#{s.version}" } s.source_files = "iOS/MMKV/MMKV", "iOS/MMKV/MMKV/*.{h,mm,hpp}" diff --git a/MMKVCore.podspec b/MMKVCore.podspec index b8a7e804..31118e5b 100644 --- a/MMKVCore.podspec +++ b/MMKVCore.podspec @@ -18,6 +18,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.13" s.tvos.deployment_target = "13.0" s.watchos.deployment_target = "4.0" + s.visionos.deployment_target = "1.0" s.source = { :git => "https://github.com/Tencent/MMKV.git", :tag => "v#{s.version}" } s.source_files = "Core", "Core/*.{h,cpp,hpp}", "Core/aes/*", "Core/aes/openssl/*", "Core/crc32/*.h" From 5df953dae1e86559f2976599e22d071b7f9bd5ca Mon Sep 17 00:00:00 2001 From: ColMugX Date: Mon, 26 Feb 2024 06:16:42 +0000 Subject: [PATCH 07/10] chore: FIX README --- README.md | 10 +++++----- README_CN.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7aead196..bfd5d32a 100644 --- a/README.md +++ b/README.md @@ -157,11 +157,11 @@ For more benchmark data, please refer to [our benchmark](https://github.com/Tenc git clone https://github.com/Tencent/MMKV.git ``` -2. Add `Win32/MMKV/MMKV.vcxproj` to your solution; +2. Add `Core/core.vcxproj` to your solution; 3. Add `MMKV` project to your project's dependencies; 4. Add `$(OutDir)include` to your project's `C/C++` -> `General` -> `Additional Include Directories`; 5. Add `$(OutDir)` to your project's `Linker` -> `General` -> `Additional Library Directories`; -6. Add `MMKV.lib` to your project's `Linker` -> `Input` -> `Additional Dependencies`; +6. Add `mmkv.lib` to your project's `Linker` -> `Input` -> `Additional Dependencies`; 7. Add `#include ` to your source file and we are done. @@ -285,6 +285,6 @@ To give clarity of what is expected of our members, MMKV has adopted the code of ## FAQ & Feedback Check out the [FAQ](https://github.com/Tencent/MMKV/wiki/FAQ) first. Should there be any questions, don't hesitate to create [issues](https://github.com/Tencent/MMKV/issues). - -## Personal Information Protection Rules -User privacy is taken very seriously: MMKV does not obtain, collect or upload any personal information. Please refer to the [MMKV SDK Personal Information Protection Rules](https://support.weixin.qq.com/cgi-bin/mmsupportacctnodeweb-bin/pages/aY5BAtRiO1BpoHxo) for details. + +## Personal Information Protection Rules +User privacy is taken very seriously: MMKV does not obtain, collect or upload any personal information. Please refer to the [MMKV SDK Personal Information Protection Rules](https://support.weixin.qq.com/cgi-bin/mmsupportacctnodeweb-bin/pages/aY5BAtRiO1BpoHxo) for details. diff --git a/README_CN.md b/README_CN.md index 6e2bc42d..e12694c2 100644 --- a/README_CN.md +++ b/README_CN.md @@ -124,11 +124,11 @@ MMKV 支持**多进程访问**，更详细的用法参考 [iOS/macOS Tutorial](h git clone https://github.com/Tencent/MMKV.git ``` - 2. 添加工程 `Win32/MMKV/MMKV.vcxproj` 到你的项目里； + 2. 添加工程 `Core/core.vcxproj` 到你的项目里； 3. 设置你的主工程依赖于 `MMKV` 工程; 4. 添加目录 `$(OutDir)include` 到你主工程的 `C/C++` -> `常规` -> `附加包含目录`; 5. 添加目录 `$(OutDir)` 到你主工程的 `链接器` -> `常规` -> `附加库目录`; - 6. 添加 `MMKV.lib` 到你主工程的 `链接器` -> `输入` -> `附加依赖项`; + 6. 添加 `mmkv.lib` 到你主工程的 `链接器` -> `输入` -> `附加依赖项`; 7. 添加头文件 `#include `，就可以愉快地开始你的 MMKV 之旅了。 注意： @@ -241,6 +241,6 @@ MMKV 以 BSD 3-Clause 证书开源，详情参见 [LICENSE.TXT](./LICENSE.TXT) ## 问题 & 反馈 常见问题参见 [FAQ](https://github.com/Tencent/MMKV/wiki/FAQ_cn)，欢迎提 [issues](https://github.com/Tencent/MMKV/issues) 提问反馈。 - -## 个人信息处理规则 -MMKV 不收集、获取或上传任何个人信息，详情参考[《MMKV SDK个人信息保护规则》](https://support.weixin.qq.com/cgi-bin/mmsupportacctnodeweb-bin/pages/aY5BAtRiO1BpoHxo)。 + +## 个人信息处理规则 +MMKV 不收集、获取或上传任何个人信息，详情参考[《MMKV SDK个人信息保护规则》](https://support.weixin.qq.com/cgi-bin/mmsupportacctnodeweb-bin/pages/aY5BAtRiO1BpoHxo)。 From 8aec6da92774fb638dfe119cb1718133a8b81e6c Mon Sep 17 00:00:00 2001 From: MrWander Date: Fri, 8 Mar 2024 14:00:13 +0800 Subject: [PATCH 08/10] bugfix: trim sigbus --- Core/MMKV_IO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/MMKV_IO.cpp b/Core/MMKV_IO.cpp index 696b7399..3cc91431 100755 --- a/Core/MMKV_IO.cpp +++ b/Core/MMKV_IO.cpp @@ -1388,6 +1388,7 @@ void MMKV::trim() { SCOPED_LOCK(m_lock); MMKVInfo("prepare to trim %s", m_mmapID.c_str()); + SCOPED_LOCK(m_exclusiveProcessLock); checkLoadData(); if (!isFileValid()) { MMKVWarning("[%s] file not valid", m_mmapID.c_str()); @@ -1400,7 +1401,6 @@ void MMKV::trim() { } else if (m_file->getFileSize() <= m_expectedCapacity) { return; } - SCOPED_LOCK(m_exclusiveProcessLock); fullWriteback(); auto oldSize = m_file->getFileSize(); From 51d692007fd6210fe3bcdedd6eee9d8120b98601 Mon Sep 17 00:00:00 2001 From: guoling Date: Thu, 14 Mar 2024 16:01:01 +0800 Subject: [PATCH 09/10] prepare for v1.3.4 --- Android/MMKV/gradle.properties | 4 ++-- Android/MMKV/mmkvdemo/build.gradle | 6 +++--- CHANGELOG.md | 10 ++++++++++ Core/MMKVPredef.h | 2 +- MMKV.podspec | 4 ++-- MMKVAppExtension.podspec | 4 ++-- MMKVCore.podspec | 2 +- MMKVWatchExtension.podspec | 4 ++-- README.md | 6 +++--- README_CN.md | 4 ++-- flutter/CHANGELOG.md | 4 ++++ flutter/README.md | 6 +++--- flutter/android/build.gradle | 2 +- flutter/example/android/app/build.gradle | 2 +- flutter/ios/mmkvflutter.podspec | 4 ++-- flutter/pubspec.yaml | 2 +- iOS/MMKV/MMKV.xcodeproj/project.pbxproj | 12 ++++++------ 17 files changed, 46 insertions(+), 32 deletions(-) diff --git a/Android/MMKV/gradle.properties b/Android/MMKV/gradle.properties index 006f6dfd..100e1e88 100644 --- a/Android/MMKV/gradle.properties +++ b/Android/MMKV/gradle.properties @@ -14,9 +14,9 @@ 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.3.3 +VERSION_NAME_PREFIX=1.3.4 #VERSION_NAME_SUFFIX=-SNAPSHOT VERSION_NAME_SUFFIX= RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2 -SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots \ No newline at end of file +SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots diff --git a/Android/MMKV/mmkvdemo/build.gradle b/Android/MMKV/mmkvdemo/build.gradle index 5eac6f91..50180544 100644 --- a/Android/MMKV/mmkvdemo/build.gradle +++ b/Android/MMKV/mmkvdemo/build.gradle @@ -77,9 +77,9 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':mmkv') -// implementation 'com.tencent:mmkv:1.3.3' -// implementation 'com.tencent:mmkv-static:1.3.3' // this is identical to 'com.tencent:mmkv' -// implementation 'com.tencent:mmkv-shared:1.3.3' +// implementation 'com.tencent:mmkv:1.3.4' +// implementation 'com.tencent:mmkv-static:1.3.4' // this is identical to 'com.tencent:mmkv' +// implementation 'com.tencent:mmkv-shared:1.3.4' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a931247..6660bfdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ # MMKV Change Log +## v1.3.4 / 2024-03-15 +### Changes for All platforms +* Make `trim()` more robust in multi-process mode. + +### iOS & macOS +* Support visionOS. + +### POSIX +* Fix a compile error on `::unlink()`. + ## v1.3.3 / 2024-01-25 ### Changes for All platforms * Add `removeStorage()` static method to safely delete underlying files of an MMKV instance. diff --git a/Core/MMKVPredef.h b/Core/MMKVPredef.h index 7459cd4c..8d17e7cd 100755 --- a/Core/MMKVPredef.h +++ b/Core/MMKVPredef.h @@ -34,7 +34,7 @@ #include #include -constexpr auto MMKV_VERSION = "v1.3.3"; +constexpr auto MMKV_VERSION = "v1.3.4"; #ifdef DEBUG # define MMKV_DEBUG diff --git a/MMKV.podspec b/MMKV.podspec index 040bbf89..ec24626c 100644 --- a/MMKV.podspec +++ b/MMKV.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MMKV" - s.version = "1.3.3" + s.version = "1.3.4" s.summary = "MMKV is a cross-platform key-value storage framework developed by WeChat." s.description = <<-DESC @@ -32,7 +32,7 @@ Pod::Spec.new do |s| "CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF" => "NO", } - s.dependency 'MMKVCore', '~> 1.3.3' + s.dependency 'MMKVCore', '~> 1.3.4' end diff --git a/MMKVAppExtension.podspec b/MMKVAppExtension.podspec index eeef4547..5958b7f5 100644 --- a/MMKVAppExtension.podspec +++ b/MMKVAppExtension.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MMKVAppExtension" - s.version = "1.3.3" + s.version = "1.3.4" s.summary = "MMKV is a cross-platform key-value storage framework developed by WeChat." s.module_name = "MMKVAppExtension" @@ -31,7 +31,7 @@ Pod::Spec.new do |s| "GCC_PREPROCESSOR_DEFINITIONS" => "MMKV_IOS_EXTENSION", } - s.dependency 'MMKVCore', '~> 1.3.3' + s.dependency 'MMKVCore', '~> 1.3.4' end diff --git a/MMKVCore.podspec b/MMKVCore.podspec index 31118e5b..e08031a9 100644 --- a/MMKVCore.podspec +++ b/MMKVCore.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MMKVCore" - s.version = "1.3.3" + s.version = "1.3.4" s.summary = "MMKVCore for MMKV. MMKV is a cross-platform key-value storage framework developed by WeChat." s.description = <<-DESC diff --git a/MMKVWatchExtension.podspec b/MMKVWatchExtension.podspec index 899407f1..6096cd30 100644 --- a/MMKVWatchExtension.podspec +++ b/MMKVWatchExtension.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MMKVWatchExtension" - s.version = "1.3.3" + s.version = "1.3.4" s.summary = "MMKV is a cross-platform key-value storage framework developed by WeChat." s.module_name = "MMKVWatchExtension" @@ -31,7 +31,7 @@ Pod::Spec.new do |s| "GCC_PREPROCESSOR_DEFINITIONS" => "MMKV_IOS_EXTENSION", } - s.dependency 'MMKVCore', '~> 1.3.3' + s.dependency 'MMKVCore', '~> 1.3.4' end diff --git a/README.md b/README.md index bfd5d32a..f4dfd14a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls) -[![Release Version](https://img.shields.io/badge/release-1.3.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases) +[![Release Version](https://img.shields.io/badge/release-1.3.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases) [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS%2FmacOS%20%7C%20Win32%20%7C%20POSIX-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home) 中文版本请参看[这里](./README_CN.md) @@ -28,8 +28,8 @@ Add the following lines to `build.gradle` on your app module: ```gradle dependencies { - implementation 'com.tencent:mmkv:1.3.3' - // replace "1.3.3" with any available version + implementation 'com.tencent:mmkv:1.3.4' + // replace "1.3.4" with any available version } ``` diff --git a/README_CN.md b/README_CN.md index e12694c2..ec7b790c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -22,8 +22,8 @@ MMKV 是基于 mmap 内存映射的 key-value 组件，底层序列化/反序列 ```gradle dependencies { - implementation 'com.tencent:mmkv:1.3.3' - // replace "1.3.3" with any available version + implementation 'com.tencent:mmkv:1.3.4' + // replace "1.3.4" with any available version } ``` 更多安装指引参考 [Android Setup](https://github.com/Tencent/MMKV/wiki/android_setup_cn)。 diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md index 8ecbc02f..cc7d8ae8 100644 --- a/flutter/CHANGELOG.md +++ b/flutter/CHANGELOG.md @@ -1,4 +1,8 @@ # MMKV for Flutter Change Log + +## v1.3.4 / 2024-03-15 +* Make `trim()` more robust in multi-process mode. + ## v1.3.3 / 2024-01-25 * Add `removeStorage()` static method to safely delete underlying files of an MMKV instance. * Add protection from a potential crash of a multi-process MMKV loading due to the MMKV file not being valid. diff --git a/flutter/README.md b/flutter/README.md index d28f6343..ac8cb4fd 100644 --- a/flutter/README.md +++ b/flutter/README.md @@ -1,6 +1,6 @@ [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls) -[![Release Version](https://img.shields.io/badge/release-1.3.3-brightgreen.svg)](https://github.com/Tencent/MMKV/releases) +[![Release Version](https://img.shields.io/badge/release-1.3.4-brightgreen.svg)](https://github.com/Tencent/MMKV/releases) [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home) MMKV is an **efficient**, **small**, **easy-to-use** mobile key-value storage framework used in the WeChat application. It's currently available on **Android** and **iOS**. @@ -26,11 +26,11 @@ Add the following lines to `pubspec.yaml` on your app module. Then run `flutter ```yaml dependencies: - mmkv: ">=1.3.3" + mmkv: ">=1.3.4" ... ``` -If you already include MMKV native lib in your App, you need to upgrade to version newer than v1.3.3. +If you already include MMKV native lib in your App, you need to upgrade to version newer than v1.3.4. #### iOS To avoid conflict of the native lib name 'libMMKV.so' on iOS, we need to **change the plugin name 'mmkv' to 'mmkvflutter'**. diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle index 83e27b26..a075e9de 100644 --- a/flutter/android/build.gradle +++ b/flutter/android/build.gradle @@ -34,6 +34,6 @@ android { } dependencies { - implementation 'com.tencent:mmkv:1.3.3' + implementation 'com.tencent:mmkv:1.3.4' } } diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle index b14f2d0d..86dacb7a 100644 --- a/flutter/example/android/app/build.gradle +++ b/flutter/example/android/app/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation('com.tencent:mmkv:1.3.3') + implementation('com.tencent:mmkv:1.3.4') constraints { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { diff --git a/flutter/ios/mmkvflutter.podspec b/flutter/ios/mmkvflutter.podspec index 6aaee78d..4247b77e 100644 --- a/flutter/ios/mmkvflutter.podspec +++ b/flutter/ios/mmkvflutter.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |s| s.name = 'mmkvflutter' - s.version = '1.3.3' + s.version = '1.3.4' s.summary = 'MMKV is a cross-platform key-value storage framework developed by WeChat.' s.description = <<-DESC The MMKV, for Flutter. @@ -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.3' + s.dependency 'MMKV', '>= 1.3.4' s.platform = :ios, '11.0' # Flutter.framework does not contain a i386 slice. diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 3b50b022..9e6f14c8 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: mmkv description: An efficient, small mobile key-value storage framework developed by WeChat. Works on Android & iOS. -version: 1.3.3 +version: 1.3.4 homepage: https://github.com/Tencent/mmkv environment: diff --git a/iOS/MMKV/MMKV.xcodeproj/project.pbxproj b/iOS/MMKV/MMKV.xcodeproj/project.pbxproj index 409eeab8..e45e36c4 100644 --- a/iOS/MMKV/MMKV.xcodeproj/project.pbxproj +++ b/iOS/MMKV/MMKV.xcodeproj/project.pbxproj @@ -493,7 +493,7 @@ INFOPLIST_FILE = "MMKV copy-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, @@ -535,7 +535,7 @@ INFOPLIST_FILE = "MMKV copy-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, @@ -735,7 +735,7 @@ INFOPLIST_FILE = "$(SRCROOT)/MMKV/Resources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, @@ -774,7 +774,7 @@ INFOPLIST_FILE = "$(SRCROOT)/MMKV/Resources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, @@ -819,7 +819,7 @@ INFOPLIST_FILE = "MMKVAppExtension copy-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, @@ -863,7 +863,7 @@ INFOPLIST_FILE = "MMKVAppExtension copy-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; "OTHER_LDFLAGS[sdk=iphoneos*]" = ( "-framework", UIKit, From 2e9fdcba923f4ea4a29e0869b2cd9044386ed535 Mon Sep 17 00:00:00 2001 From: guoling Date: Fri, 15 Mar 2024 15:21:17 +0800 Subject: [PATCH 10/10] upgrade some flutter deps --- flutter/example/android/app/build.gradle | 2 +- flutter/example/pubspec.lock | 62 ++++++++--------- flutter/pubspec.lock | 88 ++++++++++++------------ 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle index 86dacb7a..82b10776 100644 --- a/flutter/example/android/app/build.gradle +++ b/flutter/example/android/app/build.gradle @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "com.tencent.mmkv_example" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock index 3e83c379..6aabe9df 100644 --- a/flutter/example/pubspec.lock +++ b/flutter/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -95,17 +95,17 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mmkv: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.3.2" + version: "1.3.4" path: dependency: transitive description: @@ -118,26 +118,26 @@ packages: dependency: "direct main" description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" path_provider_linux: dependency: transitive description: @@ -150,10 +150,10 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: @@ -166,18 +166,18 @@ packages: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.1.8" sky_engine: dependency: transitive description: flutter @@ -195,18 +195,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -227,10 +227,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -243,26 +243,26 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.7.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.10.0" diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index e74b55b2..b0e77e69 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "64.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.2.0" args: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: coverage - sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb" + sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" url: "https://pub.dev" source: hosted - version: "1.6.4" + version: "1.7.2" crypto: dependency: transitive description: @@ -215,18 +215,18 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" node_preamble: dependency: transitive description: @@ -255,26 +255,26 @@ packages: dependency: "direct main" description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" path_provider_linux: dependency: transitive description: @@ -287,10 +287,10 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: @@ -303,18 +303,18 @@ packages: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.1.8" pool: dependency: transitive description: @@ -396,18 +396,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -428,26 +428,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" + sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f url: "https://pub.dev" source: hosted - version: "1.24.3" + version: "1.24.9" test_api: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" test_core: dependency: transitive description: name: test_core - sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" + sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.9" typed_data: dependency: transitive description: @@ -468,10 +468,10 @@ packages: dependency: transitive description: name: vm_service - sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "11.10.0" + version: "13.0.0" watcher: dependency: transitive description: @@ -484,10 +484,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -508,18 +508,18 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" yaml: dependency: transitive description: @@ -529,5 +529,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.7.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.10.0"