Skip to content

Commit

Permalink
Merge pull request #7 from ReneLindhorst/master
Browse files Browse the repository at this point in the history 
Support for framework generation
  • Loading branch information
@lyokato
lyokato committed Feb 16, 2015
2 parents b5bff8b + 741468f commit 4b48fd4
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 45 deletions.
6 changes: 3 additions & 3 deletions Classes/ARC/GeoHash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ THE SOFTWARE.
*/

#import <Foundation/Foundation.h>
#import "GHArea.h"
#import "GHRange.h"
#import "GHNeighbors.h"

@class GHArea;
@class GHNeighbors;

typedef enum {
GHDirectionNorth = 0,
Expand Down
3 changes: 3 additions & 0 deletions Classes/ARC/GeoHash.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ of this software and associated documentation files (the "Software"), to deal
#import "GeoHash.h"
#import "GHArea.h"
#import "GHRange.h"
#import "GHNeighbors.h"
#import "cgeohash.h"



@interface GeoHash()
+ (GEOHASH_direction)convertDirectionType:(GHDirection)dir;
@end
Expand Down
81 changes: 40 additions & 41 deletions Projects/GeoHashExample/GeoHashExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,12 @@
9086151014AB34A400CA2B04 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 908614F114AB34A400CA2B04 /* Foundation.framework */; };
9086151114AB34A400CA2B04 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 908614F314AB34A400CA2B04 /* CoreGraphics.framework */; };
9086151914AB34A400CA2B04 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9086151714AB34A400CA2B04 /* InfoPlist.strings */; };
9086152F14AB352200CA2B04 /* cgeohash.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152514AB352200CA2B04 /* cgeohash.m */; };
9086153014AB352200CA2B04 /* cgeohash.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152514AB352200CA2B04 /* cgeohash.m */; };
9086153114AB352200CA2B04 /* GeoHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152814AB352200CA2B04 /* GeoHash.m */; };
9086153214AB352200CA2B04 /* GeoHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152814AB352200CA2B04 /* GeoHash.m */; };
9086153314AB352200CA2B04 /* GHArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152A14AB352200CA2B04 /* GHArea.m */; };
9086153414AB352200CA2B04 /* GHArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152A14AB352200CA2B04 /* GHArea.m */; };
9086153514AB352200CA2B04 /* GHNeighbors.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152C14AB352200CA2B04 /* GHNeighbors.m */; };
9086153614AB352200CA2B04 /* GHNeighbors.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152C14AB352200CA2B04 /* GHNeighbors.m */; };
9086153714AB352200CA2B04 /* GHRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152E14AB352200CA2B04 /* GHRange.m */; };
9086153814AB352200CA2B04 /* GHRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086152E14AB352200CA2B04 /* GHRange.m */; };
9086153B14AB357700CA2B04 /* GeoHashTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086153A14AB357700CA2B04 /* GeoHashTestCase.m */; };
A7B48EC21A9206CF00F29AA5 /* cgeohash.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B48EB91A9206CF00F29AA5 /* cgeohash.m */; };
A7B48EC31A9206CF00F29AA5 /* GeoHash.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B48EBB1A9206CF00F29AA5 /* GeoHash.m */; };
A7B48EC41A9206CF00F29AA5 /* GHArea.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B48EBD1A9206CF00F29AA5 /* GHArea.m */; };
A7B48EC51A9206CF00F29AA5 /* GHNeighbors.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B48EBF1A9206CF00F29AA5 /* GHNeighbors.m */; };
A7B48EC61A9206CF00F29AA5 /* GHRange.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B48EC11A9206CF00F29AA5 /* GHRange.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -61,18 +56,18 @@
9086150D14AB34A400CA2B04 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
9086151614AB34A400CA2B04 /* GeoHashExampleTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GeoHashExampleTests-Info.plist"; sourceTree = "<group>"; };
9086151814AB34A400CA2B04 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
9086152514AB352200CA2B04 /* cgeohash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cgeohash.m; sourceTree = "<group>"; };
9086152614AB352200CA2B04 /* cgeohash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cgeohash.h; sourceTree = "<group>"; };
9086152714AB352200CA2B04 /* GeoHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeoHash.h; sourceTree = "<group>"; };
9086152814AB352200CA2B04 /* GeoHash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeoHash.m; sourceTree = "<group>"; };
9086152914AB352200CA2B04 /* GHArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHArea.h; sourceTree = "<group>"; };
9086152A14AB352200CA2B04 /* GHArea.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHArea.m; sourceTree = "<group>"; };
9086152B14AB352200CA2B04 /* GHNeighbors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHNeighbors.h; sourceTree = "<group>"; };
9086152C14AB352200CA2B04 /* GHNeighbors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHNeighbors.m; sourceTree = "<group>"; };
9086152D14AB352200CA2B04 /* GHRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHRange.h; sourceTree = "<group>"; };
9086152E14AB352200CA2B04 /* GHRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHRange.m; sourceTree = "<group>"; };
9086153914AB357700CA2B04 /* GeoHashTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeoHashTestCase.h; sourceTree = "<group>"; };
9086153A14AB357700CA2B04 /* GeoHashTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeoHashTestCase.m; sourceTree = "<group>"; };
A7B48EB81A9206CF00F29AA5 /* cgeohash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cgeohash.h; sourceTree = "<group>"; };
A7B48EB91A9206CF00F29AA5 /* cgeohash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cgeohash.m; sourceTree = "<group>"; };
A7B48EBA1A9206CF00F29AA5 /* GeoHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeoHash.h; sourceTree = "<group>"; };
A7B48EBB1A9206CF00F29AA5 /* GeoHash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeoHash.m; sourceTree = "<group>"; };
A7B48EBC1A9206CF00F29AA5 /* GHArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHArea.h; sourceTree = "<group>"; };
A7B48EBD1A9206CF00F29AA5 /* GHArea.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHArea.m; sourceTree = "<group>"; };
A7B48EBE1A9206CF00F29AA5 /* GHNeighbors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHNeighbors.h; sourceTree = "<group>"; };
A7B48EBF1A9206CF00F29AA5 /* GHNeighbors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHNeighbors.m; sourceTree = "<group>"; };
A7B48EC01A9206CF00F29AA5 /* GHRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHRange.h; sourceTree = "<group>"; };
A7B48EC11A9206CF00F29AA5 /* GHRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHRange.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -133,16 +128,7 @@
908614F514AB34A400CA2B04 /* GeoHashExample */ = {
isa = PBXGroup;
children = (
9086152514AB352200CA2B04 /* cgeohash.m */,
9086152614AB352200CA2B04 /* cgeohash.h */,
9086152714AB352200CA2B04 /* GeoHash.h */,
9086152814AB352200CA2B04 /* GeoHash.m */,
9086152914AB352200CA2B04 /* GHArea.h */,
9086152A14AB352200CA2B04 /* GHArea.m */,
9086152B14AB352200CA2B04 /* GHNeighbors.h */,
9086152C14AB352200CA2B04 /* GHNeighbors.m */,
9086152D14AB352200CA2B04 /* GHRange.h */,
9086152E14AB352200CA2B04 /* GHRange.m */,
A7B48EB71A9206CF00F29AA5 /* objc-geohash (ARC) */,
908614FE14AB34A400CA2B04 /* GeoHashExampleAppDelegate.h */,
908614FF14AB34A400CA2B04 /* GeoHashExampleAppDelegate.m */,
9086150114AB34A400CA2B04 /* GeoHashExampleViewController.h */,
Expand Down Expand Up @@ -183,6 +169,24 @@
name = "Supporting Files";
sourceTree = "<group>";
};
A7B48EB71A9206CF00F29AA5 /* objc-geohash (ARC) */ = {
isa = PBXGroup;
children = (
A7B48EB81A9206CF00F29AA5 /* cgeohash.h */,
A7B48EB91A9206CF00F29AA5 /* cgeohash.m */,
A7B48EBA1A9206CF00F29AA5 /* GeoHash.h */,
A7B48EBB1A9206CF00F29AA5 /* GeoHash.m */,
A7B48EBC1A9206CF00F29AA5 /* GHArea.h */,
A7B48EBD1A9206CF00F29AA5 /* GHArea.m */,
A7B48EBE1A9206CF00F29AA5 /* GHNeighbors.h */,
A7B48EBF1A9206CF00F29AA5 /* GHNeighbors.m */,
A7B48EC01A9206CF00F29AA5 /* GHRange.h */,
A7B48EC11A9206CF00F29AA5 /* GHRange.m */,
);
name = "objc-geohash (ARC)";
path = ../../../Classes/ARC;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -220,7 +224,7 @@
name = GeoHashExampleTests;
productName = GeoHashExampleTests;
productReference = 9086150C14AB34A400CA2B04 /* GeoHashExampleTests.octest */;
productType = "com.apple.product-type.bundle";
productType = "com.apple.product-type.bundle.ocunit-test";
};
/* End PBXNativeTarget section */

Expand Down Expand Up @@ -290,26 +294,21 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A7B48EC51A9206CF00F29AA5 /* GHNeighbors.m in Sources */,
908614FC14AB34A400CA2B04 /* main.m in Sources */,
9086150014AB34A400CA2B04 /* GeoHashExampleAppDelegate.m in Sources */,
A7B48EC21A9206CF00F29AA5 /* cgeohash.m in Sources */,
9086150314AB34A400CA2B04 /* GeoHashExampleViewController.m in Sources */,
9086152F14AB352200CA2B04 /* cgeohash.m in Sources */,
9086153114AB352200CA2B04 /* GeoHash.m in Sources */,
9086153314AB352200CA2B04 /* GHArea.m in Sources */,
9086153514AB352200CA2B04 /* GHNeighbors.m in Sources */,
9086153714AB352200CA2B04 /* GHRange.m in Sources */,
A7B48EC31A9206CF00F29AA5 /* GeoHash.m in Sources */,
A7B48EC41A9206CF00F29AA5 /* GHArea.m in Sources */,
A7B48EC61A9206CF00F29AA5 /* GHRange.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
9086150714AB34A400CA2B04 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9086153014AB352200CA2B04 /* cgeohash.m in Sources */,
9086153214AB352200CA2B04 /* GeoHash.m in Sources */,
9086153414AB352200CA2B04 /* GHArea.m in Sources */,
9086153614AB352200CA2B04 /* GHNeighbors.m in Sources */,
9086153814AB352200CA2B04 /* GHRange.m in Sources */,
9086153B14AB357700CA2B04 /* GeoHashTestCase.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
3 changes: 2 additions & 1 deletion objc-geohash.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Pod::Spec.new do |spec|
spec.license = 'MIT'
spec.summary = 'Objective-C GeoHash Library.'
spec.author = { 'Lyo Kato' => 'lyo.kato@gmail.com' }
spec.source = { :git => 'https://github.com/lyokato/objc-geohash.git', :commit => 'fd4149cb79dd0b6c9acd553000ccdf28460808b1' }
spec.source = { :git => 'https://github.com/lyokato/objc-geohash.git', :commit => '0a2d5430db6368c201141320c4026142e5851a85' }
spec.source_files = 'Classes/ARC/*'
spec.header_dir = 'Objc_GeoHash'
spec.requires_arc = true
end

0 comments on commit 4b48fd4

Please sign in to comment.