Skip to content
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

Jump to bottom

ARC refactoring + SPM support #115

Open
wants to merge 2 commits into
base: ARC
Choose a base branch
from
Open

ARC refactoring + SPM support #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bad4d6
Added SPM definitions
daniel-muhra-cw Jul 12, 2022
123c8ee
ARC refactoring
daniel-muhra-cw Jul 14, 2022
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
22 changes: 15 additions & 7 deletions DemoApps/GRMustacheDemoOSX/GRMustacheDemoOSX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
5626CE561BD253C90087F1C3 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5626CE551BD253C90087F1C3 /* ViewController.m */; };
5626CE581BD253C90087F1C3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5626CE571BD253C90087F1C3 /* Assets.xcassets */; };
5626CE5B1BD253C90087F1C3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5626CE591BD253C90087F1C3 /* Main.storyboard */; };
5626CE631BD253FE0087F1C3 /* GRMustache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5626CE621BD253FE0087F1C3 /* GRMustache.framework */; };
5626CE641BD253FE0087F1C3 /* GRMustache.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5626CE621BD253FE0087F1C3 /* GRMustache.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5626CE681BD255010087F1C3 /* Model.m in Sources */ = {isa = PBXBuildFile; fileRef = 5626CE671BD255010087F1C3 /* Model.m */; settings = {ASSET_TAGS = (); }; };
5626CE681BD255010087F1C3 /* Model.m in Sources */ = {isa = PBXBuildFile; fileRef = 5626CE671BD255010087F1C3 /* Model.m */; };
6505B2B62880121B00C9B2F5 /* GRMustache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6505B2B52880121B00C9B2F5 /* GRMustache.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -24,7 +23,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
5626CE641BD253FE0087F1C3 /* GRMustache.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -41,17 +39,17 @@
5626CE571BD253C90087F1C3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5626CE5A1BD253C90087F1C3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5626CE5C1BD253C90087F1C3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5626CE621BD253FE0087F1C3 /* GRMustache.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GRMustache.framework; path = Carthage/Build/Mac/GRMustache.framework; sourceTree = "<group>"; };
5626CE661BD255010087F1C3 /* Model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Model.h; sourceTree = "<group>"; };
5626CE671BD255010087F1C3 /* Model.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Model.m; sourceTree = "<group>"; };
6505B2B52880121B00C9B2F5 /* GRMustache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GRMustache.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
5626CE481BD253C90087F1C3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5626CE631BD253FE0087F1C3 /* GRMustache.framework in Frameworks */,
6505B2B62880121B00C9B2F5 /* GRMustache.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -61,9 +59,9 @@
5626CE421BD253C90087F1C3 = {
isa = PBXGroup;
children = (
5626CE621BD253FE0087F1C3 /* GRMustache.framework */,
5626CE4D1BD253C90087F1C3 /* GRMustacheDemoOSX */,
5626CE4C1BD253C90087F1C3 /* Products */,
6505B2B42880121B00C9B2F5 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -100,6 +98,14 @@
name = "Supporting Files";
sourceTree = "<group>";
};
6505B2B42880121B00C9B2F5 /* Frameworks */ = {
isa = PBXGroup;
children = (
6505B2B52880121B00C9B2F5 /* GRMustache.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -140,6 +146,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -321,6 +328,7 @@
5626CE611BD253C90087F1C3 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
31 changes: 29 additions & 2 deletions DemoApps/GRMustacheDemoiOS/GRMustacheDemoiOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
566373B31BD118AB00E1B35D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 566373B11BD118AB00E1B35D /* Main.storyboard */; };
566373B51BD118AB00E1B35D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 566373B41BD118AB00E1B35D /* Assets.xcassets */; };
566373B81BD118AB00E1B35D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 566373B61BD118AB00E1B35D /* LaunchScreen.storyboard */; };
56A8FB461BD11AA40098CE03 /* layout.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 56A8FB451BD11AA40098CE03 /* layout.mustache */; settings = {ASSET_TAGS = (); }; };
56A8FB4D1BD11AAD0098CE03 /* template.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 56A8FB4C1BD11AAD0098CE03 /* template.mustache */; settings = {ASSET_TAGS = (); }; };
56A8FB461BD11AA40098CE03 /* layout.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 56A8FB451BD11AA40098CE03 /* layout.mustache */; };
56A8FB4D1BD11AAD0098CE03 /* template.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 56A8FB4C1BD11AAD0098CE03 /* template.mustache */; };
6505B2BD2880125700C9B2F5 /* GRMustache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 566373CF1BD118DC00E1B35D /* GRMustache.framework */; };
6505B2BE2880125700C9B2F5 /* GRMustache.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 566373CF1BD118DC00E1B35D /* GRMustache.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -69,6 +71,20 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
6505B2BF2880125700C9B2F5 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
6505B2BE2880125700C9B2F5 /* GRMustache.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
566373A51BD118AB00E1B35D /* GRMustacheDemoiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GRMustacheDemoiOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
566373A91BD118AB00E1B35D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand All @@ -90,6 +106,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6505B2BD2880125700C9B2F5 /* GRMustache.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -101,6 +118,7 @@
children = (
566373A71BD118AB00E1B35D /* GRMustacheDemoiOS */,
566373A61BD118AB00E1B35D /* Products */,
6505B2B72880125700C9B2F5 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -160,6 +178,13 @@
name = Resources;
sourceTree = "<group>";
};
6505B2B72880125700C9B2F5 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -170,6 +195,7 @@
566373A11BD118AB00E1B35D /* Sources */,
566373A21BD118AB00E1B35D /* Frameworks */,
566373A31BD118AB00E1B35D /* Resources */,
6505B2BF2880125700C9B2F5 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -200,6 +226,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down
2 changes: 1 addition & 1 deletion GRMustache.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Pod::Spec.new do |s|
s.private_header_files = 'src/classes/**/*_private.h'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.requires_arc = false
s.requires_arc = true
s.framework = 'Foundation'
end
Loading