Skip to content

Commit f0c3fc1

Browse files
committed
Merge branch 'feature-cocoapods-noarc' Closes #25, but not #24
Analyzer issues (leaks) in #24 - excluded ARC commits
2 parents e97f583 + 0c80fdb commit f0c3fc1

File tree

4 files changed

+41
-1
lines changed

4 files changed

+41
-1
lines changed

AutomagicCoding.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
6D6B98AF140E162700835E88 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
7474
6D6B98CC140E2A3B00835E88 /* NSObject+AutoMagicCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AutoMagicCoding.h"; sourceTree = "<group>"; };
7575
6D6B98CD140E2A3B00835E88 /* NSObject+AutoMagicCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AutoMagicCoding.m"; sourceTree = "<group>"; };
76+
6DBAC62F17096CC100298BEB /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
77+
6DBAC6301709702800298BEB /* NSObject-AutomagicCoding.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = "NSObject-AutomagicCoding.podspec"; sourceTree = "<group>"; };
7678
FDA4D40D14D6D90200B9AE2A /* CHANGELOG */ = {isa = PBXFileReference; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
7779
FDB80CDB149D3089001E95AA /* AutomagicCodingTests-NO_THROW.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AutomagicCodingTests-NO_THROW.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
7880
FDB80D3E149E2AF8001E95AA /* AutomagicCoding-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "AutomagicCoding-Info.plist"; sourceTree = "<group>"; };
@@ -146,6 +148,8 @@
146148
children = (
147149
FDCE7BF1148A97C9009A6DCB /* README.md */,
148150
FDA4D40D14D6D90200B9AE2A /* CHANGELOG */,
151+
6DBAC62F17096CC100298BEB /* LICENSE */,
152+
6DBAC6301709702800298BEB /* NSObject-AutomagicCoding.podspec */,
149153
6D6B9897140E162700835E88 /* AutoMagicCoding */,
150154
FDB80D87149E2B5E001E95AA /* Tests */,
151155
FDB80D2A149E2AF8001E95AA /* SupportingFiles */,

CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11

2-
1.1 - XX-Jan/Feb-2012
2+
1.1.1 - 1-Apr-2013
3+
* [NEW] Cocoapods support
4+
5+
1.1 - 31-Jan-2012
36
* [NEW] Added -loadValueForKey:fromDictionaryRepresentation: method.
47
* [FIX] Default implementation of AMCKeysForDictionaryRepresentation returns complete set of all object's properties names, including properties declared by superclasses. ( Issue #15 )
58
* [FIX] Added Log, Workaround ( when AMC_NO_THROW defined) & Exception ( when AMC_NO_THROW not defined) on possible KVC failure/bug (Issue #19).

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
AMC is licensed under terms & conditions of MIT License.
2+
http://www.opensource.org/licenses/mit-license.php
3+
4+
Copyright 2011 Stepan Generalov.
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.

NSObject-AutomagicCoding.podspec

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'NSObject-AutomagicCoding'
3+
s.version = '1.1.1'
4+
s.license = { :type => 'MIT' }
5+
s.authors = { 'Stepan Generalov' => '[email protected]' }
6+
s.summary = 'Very easy to use NSCoding replacement for Mac and iOS Projects.'
7+
s.homepage = 'https://github.com/psineur/NSObject-AutomagicCoding'
8+
s.source = { :git => 'https://github.com/psineur/NSObject-AutomagicCoding.git', :tag => 'v1.1.1' }
9+
s.source_files = 'AutoMagicCoding/NSObject+AutoMagicCoding.{h,m}'
10+
s.requires_arc = false
11+
end

0 commit comments

Comments
 (0)