Skip to content

Update Mantle dependency. Removed unecessary extobjc, as it is includ… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofla2xper merged 1 commit into from
Nov 24, 2020
Merged

Update Mantle dependency. Removed unecessary extobjc, as it is includ… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions MTLManagedObjectAdapter.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MTLManagedObjectAdapter"
s.version = "1.0.4"
s.version = "1.0.5"
s.license = "MIT"
s.summary = "Model framework for Cocoa and Cocoa Touch."
s.homepage = "https://github.com/Mantle/Mantle"
Expand All @@ -14,12 +14,6 @@ Pod::Spec.new do |s|
:tvos => "9.0"
}
s.source_files = "MTLManagedObjectAdapter"
s.dependency "Mantle", "~> 2.0"
s.dependency "Mantle/extobjc", "~> 2.1.6"
s.frameworks = "Foundation", "CoreData"
s.prepare_command = "PREFIX=\"mtl_moa_\"\n# Add prefix to header imports\next_header_prefix_src() {\n SOURCE_FILE=$1\n EXT_HEADER_NAME=$2\n sed -i.bak \"s/\"${EXT_HEADER_NAME}\"/\"${PREFIX}${EXT_HEADER_NAME}\"/g\" ${SOURCE_FILE} && rm ${SOURCE_FILE}.bak\n}\next_header_prefix_src MTLManagedObjectAdapter/MTLManagedObjectAdapter.m EXTRuntimeExtensions.h\next_header_prefix_src MTLManagedObjectAdapter/MTLManagedObjectAdapter.m EXTScope.h\next_header_prefix_src MTLManagedObjectAdapter/extobjc/EXTRuntimeExtensions.m EXTRuntimeExtensions.h\next_header_prefix_src MTLManagedObjectAdapter/extobjc/EXTScope.m EXTScope.h\n# Change header name\next_header_prefix_mv() {\n SOURCE_FILE=$1\n FILE_NAME=`basename ${SOURCE_FILE}`\n DIR_NAME=`dirname ${SOURCE_FILE}`\n mv ${SOURCE_FILE} `dirname ${SOURCE_FILE}`/${PREFIX}`basename ${SOURCE_FILE}`\n}\nexport -f ext_header_prefix_mv\nexport PREFIX=${PREFIX}\nfind MTLManagedObjectAdapter/extobjc -name \"*.h\" -exec bash -c 'ext_header_prefix_mv \"$0\"' {} \\;\nunset ext_header_prefix_mv\nunset PREFIX"
s.default_subspec = 'extobjc'
s.subspec 'extobjc' do |s|
s.source_files = "MTLManagedObjectAdapter/extobjc"
s.private_header_files = "MTLManagedObjectAdapter/extobjc/*.h"
end
end
30 changes: 1 addition & 29 deletions MTLManagedObjectAdapter.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
5470B5241985122200E4D941 /* MTLManagedObjectAdapter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5470B5071985122200E4D941 /* MTLManagedObjectAdapter.framework */; };
5470B52C1985122300E4D941 /* MTLManagedObjectAdapterSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B52B1985122300E4D941 /* MTLManagedObjectAdapterSpec.m */; };
5470B583198512AE00E4D941 /* MTLManagedObjectAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5470B5171985122200E4D941 /* MTLManagedObjectAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
5470B5C819851F3900E4D941 /* EXTRuntimeExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5C219851F3900E4D941 /* EXTRuntimeExtensions.m */; };
5470B5CC19851F3900E4D941 /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5C419851F3900E4D941 /* EXTScope.m */; };
5470B5D51985208C00E4D941 /* MTLCoreDataObjects.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5D21985208C00E4D941 /* MTLCoreDataObjects.m */; };
5470B5D71985208C00E4D941 /* MTLCoreDataTestModels.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5D41985208C00E4D941 /* MTLCoreDataTestModels.m */; };
5470B5DB1985209E00E4D941 /* TestModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5D91985209E00E4D941 /* TestModel.xcdatamodeld */; };
Expand All @@ -29,8 +27,6 @@
D0EB705C1AB747F000BBB455 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB70591AB747E300BBB455 /* CoreData.framework */; };
D0EB705E1AB7487D00BBB455 /* Mantle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB705D1AB7487D00BBB455 /* Mantle.framework */; };
D0EB705F1AB748C900BBB455 /* Mantle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB705D1AB7487D00BBB455 /* Mantle.framework */; };
D0EB70601AB748E700BBB455 /* EXTRuntimeExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5C219851F3900E4D941 /* EXTRuntimeExtensions.m */; };
D0EB70611AB748E700BBB455 /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = 5470B5C419851F3900E4D941 /* EXTScope.m */; };
D0EB70651AB74A0A00BBB455 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB70631AB74A0A00BBB455 /* Quick.framework */; };
D0EB70671AB74A2200BBB455 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB70661AB74A2200BBB455 /* Nimble.framework */; };
D0EB70681AB74A2200BBB455 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EB70661AB74A2200BBB455 /* Nimble.framework */; };
Expand Down Expand Up @@ -84,12 +80,6 @@
5470B599198514F700E4D941 /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
5470B59A198514F700E4D941 /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
5470B59B198514F700E4D941 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
5470B5C019851F3900E4D941 /* EXTKeyPathCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXTKeyPathCoding.h; sourceTree = "<group>"; };
5470B5C119851F3900E4D941 /* EXTRuntimeExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXTRuntimeExtensions.h; sourceTree = "<group>"; };
5470B5C219851F3900E4D941 /* EXTRuntimeExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXTRuntimeExtensions.m; sourceTree = "<group>"; };
5470B5C319851F3900E4D941 /* EXTScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXTScope.h; sourceTree = "<group>"; };
5470B5C419851F3900E4D941 /* EXTScope.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXTScope.m; sourceTree = "<group>"; };
5470B5C519851F3900E4D941 /* metamacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metamacros.h; sourceTree = "<group>"; };
5470B5D11985208C00E4D941 /* MTLCoreDataObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTLCoreDataObjects.h; sourceTree = "<group>"; };
5470B5D21985208C00E4D941 /* MTLCoreDataObjects.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTLCoreDataObjects.m; sourceTree = "<group>"; };
5470B5D31985208C00E4D941 /* MTLCoreDataTestModels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTLCoreDataTestModels.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -212,7 +202,6 @@
5470B5111985122200E4D941 /* Supporting Files */ = {
isa = PBXGroup;
children = (
5470B5BF19851F3900E4D941 /* libextobjc */,
D0EB70581AB747C300BBB455 /* Info.plist */,
);
name = "Supporting Files";
Expand Down Expand Up @@ -306,20 +295,6 @@
path = "Mac OS X";
sourceTree = "<group>";
};
5470B5BF19851F3900E4D941 /* libextobjc */ = {
isa = PBXGroup;
children = (
5470B5C019851F3900E4D941 /* EXTKeyPathCoding.h */,
5470B5C119851F3900E4D941 /* EXTRuntimeExtensions.h */,
5470B5C219851F3900E4D941 /* EXTRuntimeExtensions.m */,
5470B5C319851F3900E4D941 /* EXTScope.h */,
5470B5C419851F3900E4D941 /* EXTScope.m */,
5470B5C519851F3900E4D941 /* metamacros.h */,
);
name = libextobjc;
path = extobjc;
sourceTree = "<group>";
};
5470B5D01985202F00E4D941 /* Specs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -447,6 +422,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 5470B4FD1985122200E4D941;
Expand Down Expand Up @@ -498,8 +474,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5470B5CC19851F3900E4D941 /* EXTScope.m in Sources */,
5470B5C819851F3900E4D941 /* EXTRuntimeExtensions.m in Sources */,
5470B5191985122200E4D941 /* MTLManagedObjectAdapter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -520,8 +494,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D0EB70611AB748E700BBB455 /* EXTScope.m in Sources */,
D0EB70601AB748E700BBB455 /* EXTRuntimeExtensions.m in Sources */,
D0EB70531AB7479700BBB455 /* MTLManagedObjectAdapter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
6 changes: 3 additions & 3 deletions MTLManagedObjectAdapter/MTLManagedObjectAdapter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#import <Mantle/Mantle.h>

#import "EXTScope.h"
#import "EXTRuntimeExtensions.h"
#import <Mantle/MTLEXTScope.h>
#import <Mantle/MTLEXTRuntimeExtensions.h>

#import "MTLManagedObjectAdapter.h"

Expand Down Expand Up @@ -741,7 +741,7 @@ - (NSDictionary *)valueTransformersForModelClass:(Class)modelClass {

if (property == NULL) continue;

mtl_moa_propertyAttributes *attributes = mtl_moa_copyPropertyAttributes(property);
mtl_propertyAttributes *attributes = mtl_copyPropertyAttributes(property);
@onExit {
free(attributes);
};
Expand Down
68 changes: 0 additions & 68 deletions MTLManagedObjectAdapter/extobjc/EXTKeyPathCoding.h
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions MTLManagedObjectAdapter/extobjc/EXTRuntimeExtensions.h
View file
Open in desktop

This file was deleted.

Loading