Skip to content

Commit 3901d0e

Browse files
lexruslexrus
authored
Merge pull request #15 from lexrus/no_bundled_db
Remove bundled Geolite2 db due to license change
2 parents dbf2b01 + 8b698b4 commit 3901d0e

File tree

7 files changed

+13
-75
lines changed

7 files changed

+13
-75
lines changed

‎MMDB-Swift.podspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MMDB-Swift"
3-
s.version = "0.4.0"
3+
s.version = "0.5.0"
44
s.summary = "A wrapper for MaxMind DB"
55
s.description = <<-DESC
66
A tiny wrapper for libmaxminddb which allows you to lookup
@@ -27,9 +27,6 @@ Pod::Spec.new do |s|
2727
s.ios.public_header_files = "Sources/libmaxminddb/*.h", "Sources/MMDB.h"
2828
s.osx.public_header_files = "Sources/libmaxminddb/*.h", "Sources/MMDB.h"
2929

30-
s.prepare_command = "./update_database.sh"
31-
s.resource = "Sources/libmaxminddb/GeoLite2-Country.mmdb"
32-
3330
s.framework = "Foundation"
3431
s.requires_arc = true
3532
end

‎MMDB.xcodeproj/project.pbxproj

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
366F5FE91F052F7F00DE3883 /* MMDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D716CB471C23A58700D89B5C /* MMDB.framework */; };
1212
366F5FF81F05301400DE3883 /* MMDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D716CB541C23A5DC00D89B5C /* MMDB.framework */; };
1313
366F5FFE1F05302300DE3883 /* MMDBTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 366F5FE61F052F7F00DE3883 /* MMDBTests.swift */; };
14+
36D1827B23C0688C002E42A5 /* GeoLite2-Country.mmdb in Resources */ = {isa = PBXBuildFile; fileRef = D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */; };
15+
36D1827C23C0688D002E42A5 /* GeoLite2-Country.mmdb in Resources */ = {isa = PBXBuildFile; fileRef = D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */; };
1416
D716CB5C1C23A65200D89B5C /* maxminddb.c in Sources */ = {isa = PBXBuildFile; fileRef = D73CAECC1C21A7A2000C2132 /* maxminddb.c */; };
1517
D716CB5D1C23A65200D89B5C /* maxminddb_unions.c in Sources */ = {isa = PBXBuildFile; fileRef = D716CB3F1C2269D200D89B5C /* maxminddb_unions.c */; };
1618
D716CB5E1C23A65D00D89B5C /* MMDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = D716CB321C21432C00D89B5C /* MMDB.swift */; };
1719
D716CB5F1C23A66C00D89B5C /* MMDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = D716CB321C21432C00D89B5C /* MMDB.swift */; };
1820
D716CB601C23A66C00D89B5C /* maxminddb.c in Sources */ = {isa = PBXBuildFile; fileRef = D73CAECC1C21A7A2000C2132 /* maxminddb.c */; };
1921
D716CB611C23A66C00D89B5C /* maxminddb_unions.c in Sources */ = {isa = PBXBuildFile; fileRef = D716CB3F1C2269D200D89B5C /* maxminddb_unions.c */; };
20-
D736A97E1C23B59D0070EAA3 /* GeoLite2-Country.mmdb in Resources */ = {isa = PBXBuildFile; fileRef = D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */; };
21-
D736A97F1C23B59F0070EAA3 /* GeoLite2-Country.mmdb in Resources */ = {isa = PBXBuildFile; fileRef = D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */; };
2222
D736A9811C23B7D40070EAA3 /* maxminddb_config.h in Headers */ = {isa = PBXBuildFile; fileRef = D73CAECE1C21A7B0000C2132 /* maxminddb_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
2323
D736A9821C23B7D40070EAA3 /* maxminddb-compat-util.h in Headers */ = {isa = PBXBuildFile; fileRef = D73CAED11C21AAEA000C2132 /* maxminddb-compat-util.h */; settings = {ATTRIBUTES = (Public, ); }; };
2424
D736A9831C23B7D40070EAA3 /* maxminddb.h in Headers */ = {isa = PBXBuildFile; fileRef = D73CAECF1C21A7B0000C2132 /* maxminddb.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -71,9 +71,6 @@
7171
D73CAECF1C21A7B0000C2132 /* maxminddb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = maxminddb.h; sourceTree = "<group>"; };
7272
D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */ = {isa = PBXFileReference; lastKnownFileType = file; path = "GeoLite2-Country.mmdb"; sourceTree = "<group>"; };
7373
D73CAED11C21AAEA000C2132 /* maxminddb-compat-util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "maxminddb-compat-util.h"; sourceTree = "<group>"; };
74-
D77179AE1EF800B300E25F23 /* MMDB-Swift.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = "MMDB-Swift.podspec"; sourceTree = "<group>"; };
75-
D77179AF1EF800B300E25F23 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
76-
D77179B01EF800B300E25F23 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
7774
D7999FEC2307B8B4003EB8CC /* data-pool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "data-pool.h"; sourceTree = "<group>"; };
7875
D7999FED2307B8B4003EB8CC /* data-pool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "data-pool.c"; sourceTree = "<group>"; };
7976
D7999FF22307B9D7003EB8CC /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -118,6 +115,7 @@
118115
366F5FE51F052F7F00DE3883 /* MMDBTests */ = {
119116
isa = PBXGroup;
120117
children = (
118+
D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */,
121119
366F5FF71F05301400DE3883 /* Info-OSX.plist */,
122120
366F5FE81F052F7F00DE3883 /* Info-iOS.plist */,
123121
366F5FE61F052F7F00DE3883 /* MMDBTests.swift */,
@@ -136,9 +134,6 @@
136134
D716CB311C21432C00D89B5C /* libmaxminddb */,
137135
366F5FE51F052F7F00DE3883 /* MMDBTests */,
138136
D716CB301C21432C00D89B5C /* Products */,
139-
D77179AE1EF800B300E25F23 /* MMDB-Swift.podspec */,
140-
D77179AF1EF800B300E25F23 /* Package.swift */,
141-
D77179B01EF800B300E25F23 /* README.md */,
142137
);
143138
sourceTree = "<group>";
144139
};
@@ -156,7 +151,6 @@
156151
D716CB311C21432C00D89B5C /* libmaxminddb */ = {
157152
isa = PBXGroup;
158153
children = (
159-
D73CAED01C21AA9A000C2132 /* GeoLite2-Country.mmdb */,
160154
D73CAED11C21AAEA000C2132 /* maxminddb-compat-util.h */,
161155
D73CAECC1C21A7A2000C2132 /* maxminddb.c */,
162156
D73CAECF1C21A7B0000C2132 /* maxminddb.h */,
@@ -254,7 +248,6 @@
254248
isa = PBXNativeTarget;
255249
buildConfigurationList = D716CB4C1C23A58700D89B5C /* Build configuration list for PBXNativeTarget "MMDB-iOS" */;
256250
buildPhases = (
257-
366F5FDD1F05152C00DE3883 /* ShellScript */,
258251
D716CB421C23A58700D89B5C /* Sources */,
259252
D716CB431C23A58700D89B5C /* Frameworks */,
260253
D716CB441C23A58700D89B5C /* Headers */,
@@ -273,7 +266,6 @@
273266
isa = PBXNativeTarget;
274267
buildConfigurationList = D716CB591C23A5DC00D89B5C /* Build configuration list for PBXNativeTarget "MMDB-OSX" */;
275268
buildPhases = (
276-
366F5FDE1F0515CD00DE3883 /* ShellScript */,
277269
D716CB4F1C23A5DC00D89B5C /* Sources */,
278270
D716CB501C23A5DC00D89B5C /* Frameworks */,
279271
D716CB511C23A5DC00D89B5C /* Headers */,
@@ -343,63 +335,34 @@
343335
isa = PBXResourcesBuildPhase;
344336
buildActionMask = 2147483647;
345337
files = (
338+
36D1827B23C0688C002E42A5 /* GeoLite2-Country.mmdb in Resources */,
346339
);
347340
runOnlyForDeploymentPostprocessing = 0;
348341
};
349342
366F5FF11F05301400DE3883 /* Resources */ = {
350343
isa = PBXResourcesBuildPhase;
351344
buildActionMask = 2147483647;
352345
files = (
346+
36D1827C23C0688D002E42A5 /* GeoLite2-Country.mmdb in Resources */,
353347
);
354348
runOnlyForDeploymentPostprocessing = 0;
355349
};
356350
D716CB451C23A58700D89B5C /* Resources */ = {
357351
isa = PBXResourcesBuildPhase;
358352
buildActionMask = 2147483647;
359353
files = (
360-
D736A97E1C23B59D0070EAA3 /* GeoLite2-Country.mmdb in Resources */,
361354
);
362355
runOnlyForDeploymentPostprocessing = 0;
363356
};
364357
D716CB521C23A5DC00D89B5C /* Resources */ = {
365358
isa = PBXResourcesBuildPhase;
366359
buildActionMask = 2147483647;
367360
files = (
368-
D736A97F1C23B59F0070EAA3 /* GeoLite2-Country.mmdb in Resources */,
369361
);
370362
runOnlyForDeploymentPostprocessing = 0;
371363
};
372364
/* End PBXResourcesBuildPhase section */
373365

374-
/* Begin PBXShellScriptBuildPhase section */
375-
366F5FDD1F05152C00DE3883 /* ShellScript */ = {
376-
isa = PBXShellScriptBuildPhase;
377-
buildActionMask = 12;
378-
files = (
379-
);
380-
inputPaths = (
381-
);
382-
outputPaths = (
383-
);
384-
runOnlyForDeploymentPostprocessing = 0;
385-
shellPath = /bin/sh;
386-
shellScript = "if [ ! -f $SRCROOT/Sources/libmaxminddb/GeoLite2-Country.mmdb ] || [ $CONFIGURATION == \"Release\" ]; then\n $SRCROOT/update_database.sh\nfi";
387-
};
388-
366F5FDE1F0515CD00DE3883 /* ShellScript */ = {
389-
isa = PBXShellScriptBuildPhase;
390-
buildActionMask = 12;
391-
files = (
392-
);
393-
inputPaths = (
394-
);
395-
outputPaths = (
396-
);
397-
runOnlyForDeploymentPostprocessing = 0;
398-
shellPath = /bin/sh;
399-
shellScript = "if [ ! -f $SRCROOT/MMDB/GeoLite2-Country.mmdb ] || [ $CONFIGURATION == \"Release\" ]; then\n $SRCROOT/update_database.sh\nfi";
400-
};
401-
/* End PBXShellScriptBuildPhase section */
402-
403366
/* Begin PBXSourcesBuildPhase section */
404367
366F5FE01F052F7F00DE3883 /* Sources */ = {
405368
isa = PBXSourcesBuildPhase;

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
A tiny wrapper for [libmaxminddb](https://github.com/maxmind/libmaxminddb) which allows you to lookup Geo data by IP address.
1111

12-
This product includes [GeoLite2 data](http://dev.maxmind.com/geoip/geoip2/geolite2/) created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).
12+
---
13+
14+
**NOTE** From `v0.5.0`, MMDB-Swift no longer bundles [GeoLite2 database](http://dev.maxmind.com/geoip/geoip2/geolite2/) due to the license change. Developers should download the binary version from the [Maxmind website](http://dev.maxmind.com/geoip/geoip2/geolite2/).
1315

1416
## CocoaPods
1517

@@ -60,7 +62,7 @@ let package = Package(
6062
## Usage
6163

6264
``` swift
63-
guard let db = MMDB() else {
65+
guard let db = MMDB("PATH_TO_THE_DATABASE") else {
6466
print("Failed to open DB.")
6567
return
6668
}

‎Sources/MMDB.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,8 @@ final public class MMDB {
7474
fileprivate typealias ListPtr = UnsafeMutablePointer<MMDB_entry_data_list_s>
7575
fileprivate typealias StringPtr = UnsafeMutablePointer<String>
7676

77-
public init?(_ filename: String? = nil) {
78-
if let filename = filename, openDB(atPath: filename) { return }
79-
80-
let path = Bundle(for: MMDB.self).path(forResource: "GeoLite2-Country", ofType: "mmdb")
81-
if let path = path, openDB(atPath: path) { return }
77+
public init?(_ filename: String) {
78+
if openDB(atPath: filename) { return }
8279

8380
return nil
8481
}

‎Sources/libmaxminddb/GeoLite2-Country.mmdb renamed to ‎Tests/MMDBTests/GeoLite2-Country.mmdb

File renamed without changes.

‎Tests/MMDBTests/MMDBTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class MMDBTests: XCTestCase {
66

77
override func setUp() {
88
super.setUp()
9-
database = MMDB()
9+
database = MMDB(Bundle(for: MMDBTests.self).path(forResource: "GeoLite2-Country", ofType: "mmdb")!)
1010
}
1111

1212
func testExample() {

‎update_database.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)