Skip to content

Commit

Permalink
merge mmkv_extension into mmkv
Browse files Browse the repository at this point in the history
  • Loading branch information
@lingol
lingol committed Mar 25, 2020
1 parent 794af2c commit 23f4fdd
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 185 deletions.
3 changes: 3 additions & 0 deletions Core/MMKVPredef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
# define MMKV_IOS_OR_MAC
# ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
# define MMKV_IOS
# if __has_feature(attribute_availability_app_extension)
# define MMKV_IOS_EXTENSION
# endif
# else
# define MMKV_MAC
# endif
Expand Down
165 changes: 10 additions & 155 deletions iOS/MMKV/MMKV.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 48;
objects = {

/* Begin PBXBuildFile section */
CB1FD4962046984F00931B5F /* libMMKV.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB1FD4952046984F00931B5F /* libMMKV.mm */; };
CB1FD4972046984F00931B5F /* MMKV.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CB1FD4942046984F00931B5F /* MMKV.h */; };
CB1FD4CD2046ACBC00931B5F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB1FD4CC2046ACBC00931B5F /* Foundation.framework */; };
CB6F6C0223ACCF53000351EA /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6F6C0123ACCF47000351EA /* libCore.a */; };
CB6F6C0523ACCF62000351EA /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6F6C0123ACCF47000351EA /* libCore.a */; };
CB6F6C0223ACCF53000351EA /* libMMKVCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6F6C0123ACCF47000351EA /* libMMKVCore.a */; };
CB6F6C0523ACCF62000351EA /* libMMKVCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6F6C0123ACCF47000351EA /* libMMKVCore.a */; };
CBC1A90220DA948A00AD5087 /* libMMKV.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB1FD4952046984F00931B5F /* libMMKV.mm */; };
CBC1A90620DA94B900AD5087 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB1FD4CC2046ACBC00931B5F /* Foundation.framework */; };
CBC1A90C20DA97DF00AD5087 /* MMKV.h in Headers */ = {isa = PBXBuildFile; fileRef = CB1FD4942046984F00931B5F /* MMKV.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBD5358823B46D0D00D3A404 /* libMMKV.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB1FD4952046984F00931B5F /* libMMKV.mm */; platformFilter = ios; };
CBD5358923B46D3400D3A404 /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6F6C0123ACCF47000351EA /* libCore.a */; };
CBD5358A23B46D3F00D3A404 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB1FD4CC2046ACBC00931B5F /* Foundation.framework */; };
CBDF32902192C0000028DB4D /* MMKVHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CBDF328F2192C0000028DB4D /* MMKVHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBDF32912192C0340028DB4D /* MMKVHandler.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CBDF328F2192C0000028DB4D /* MMKVHandler.h */; };
/* End PBXBuildFile section */
Expand All @@ -44,20 +41,6 @@
remoteGlobalIDString = CB9563D723AB2D9500ACCD39;
remoteInfo = Core;
};
CBD5359423B46EB300D3A404 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = CB6F6BFC23ACCF47000351EA /* Core.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = CB9563D723AB2D9500ACCD39;
remoteInfo = Core;
};
CBF344FD23B4A3E300168AC7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = CB1FD4892046984F00931B5F /* Project object */;
proxyType = 1;
remoteGlobalIDString = CB1FD4902046984F00931B5F;
remoteInfo = "MMKV Static";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -72,16 +55,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
CBD5357D23B46CE500D3A404 /* Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/MMKV;
dstSubfolderSpec = 16;
files = (
);
name = "Copy Files";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
Expand All @@ -94,7 +67,6 @@
CBC1A8F620DA946200AD5087 /* MMKV.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MMKV.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CBC1A90320DA94A000AD5087 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
CBC1A90A20DA95E100AD5087 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CBD5357F23B46CE500D3A404 /* libMMKV For App Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libMMKV For App Extension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
CBDF328F2192C0000028DB4D /* MMKVHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMKVHandler.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -103,7 +75,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CB6F6C0223ACCF53000351EA /* libCore.a in Frameworks */,
CB6F6C0223ACCF53000351EA /* libMMKVCore.a in Frameworks */,
CB1FD4CD2046ACBC00931B5F /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -112,20 +84,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CB6F6C0523ACCF62000351EA /* libCore.a in Frameworks */,
CB6F6C0523ACCF62000351EA /* libMMKVCore.a in Frameworks */,
CBC1A90620DA94B900AD5087 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CBD5357C23B46CE500D3A404 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CBD5358A23B46D3F00D3A404 /* Foundation.framework in Frameworks */,
CBD5358923B46D3400D3A404 /* libCore.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -144,7 +107,6 @@
children = (
CB1FD4912046984F00931B5F /* libMMKV Static.a */,
CBC1A8F620DA946200AD5087 /* MMKV.framework */,
CBD5357F23B46CE500D3A404 /* libMMKV For App Extension.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -173,7 +135,7 @@
CB6F6BFD23ACCF47000351EA /* Products */ = {
isa = PBXGroup;
children = (
CB6F6C0123ACCF47000351EA /* libCore.a */,
CB6F6C0123ACCF47000351EA /* libMMKVCore.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -238,25 +200,6 @@
productReference = CBC1A8F620DA946200AD5087 /* MMKV.framework */;
productType = "com.apple.product-type.framework";
};
CBD5357E23B46CE500D3A404 /* MMKV For App Extension */ = {
isa = PBXNativeTarget;
buildConfigurationList = CBD5358723B46CE500D3A404 /* Build configuration list for PBXNativeTarget "MMKV For App Extension" */;
buildPhases = (
CBD5357B23B46CE500D3A404 /* Sources */,
CBD5357C23B46CE500D3A404 /* Frameworks */,
CBD5357D23B46CE500D3A404 /* Copy Files */,
);
buildRules = (
);
dependencies = (
CBF344FE23B4A3E300168AC7 /* PBXTargetDependency */,
CBD5359523B46EB300D3A404 /* PBXTargetDependency */,
);
name = "MMKV For App Extension";
productName = "MMKV For App Extension";
productReference = CBD5357F23B46CE500D3A404 /* libMMKV For App Extension.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -274,9 +217,6 @@
CreatedOnToolsVersion = 9.4.1;
ProvisioningStyle = Automatic;
};
CBD5357E23B46CE500D3A404 = {
CreatedOnToolsVersion = 11.3;
};
};
};
buildConfigurationList = CB1FD48C2046984F00931B5F /* Build configuration list for PBXProject "MMKV" */;
Expand All @@ -300,16 +240,15 @@
targets = (
CB1FD4902046984F00931B5F /* MMKV Static */,
CBC1A8F520DA946200AD5087 /* MMKV */,
CBD5357E23B46CE500D3A404 /* MMKV For App Extension */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
CB6F6C0123ACCF47000351EA /* libCore.a */ = {
CB6F6C0123ACCF47000351EA /* libMMKVCore.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libCore.a;
path = libMMKVCore.a;
remoteRef = CB6F6C0023ACCF47000351EA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down Expand Up @@ -342,14 +281,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
CBD5357B23B46CE500D3A404 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CBD5358823B46D0D00D3A404 /* libMMKV.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -363,16 +294,6 @@
name = Core;
targetProxy = CB6F6C0623ACCF65000351EA /* PBXContainerItemProxy */;
};
CBD5359523B46EB300D3A404 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Core;
targetProxy = CBD5359423B46EB300D3A404 /* PBXContainerItemProxy */;
};
CBF344FE23B4A3E300168AC7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = CB1FD4902046984F00931B5F /* MMKV Static */;
targetProxy = CBF344FD23B4A3E300168AC7 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -560,11 +481,7 @@
INFOPLIST_FILE = "$(SRCROOT)/MMKV/Resources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.1.0;
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
Expand Down Expand Up @@ -604,11 +521,7 @@
INFOPLIST_FILE = "$(SRCROOT)/MMKV/Resources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.1.0;
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
Expand All @@ -630,55 +543,6 @@
};
name = Release;
};
CBD5358523B46CE500D3A404 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
MMKV_IOS_EXTENSION,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
"VALID_ARCHS[sdk=iphoneos*]" = arm64;
"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
};
name = Debug;
};
CBD5358623B46CE500D3A404 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
MMKV_IOS_EXTENSION,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "";
"VALID_ARCHS[sdk=iphoneos*]" = arm64;
"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -709,15 +573,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
CBD5358723B46CE500D3A404 /* Build configuration list for PBXNativeTarget "MMKV For App Extension" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CBD5358523B46CE500D3A404 /* Debug */,
CBD5358623B46CE500D3A404 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = CB1FD4892046984F00931B5F /* Project object */;
Expand Down
Loading

0 comments on commit 23f4fdd

Please sign in to comment.