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

Geocoding private header fix #383

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Geocoding private header fix #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ba88d2
Revert "Fix NBGeocoderMetadataHelper.h import to make all schemes com…
egoldfarb Jan 11, 2023
335d142
Revert "Fix 'umbrella header for module does not include...' error"
egoldfarb Jan 11, 2023
c33c5d3
A better fix attempt for #313 by making NBGeocoderMetadataHelper a pr…
egoldfarb Jan 11, 2023
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
1 change: 0 additions & 1 deletion libPhoneNumber-iOS/libPhoneNumberiOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ FOUNDATION_EXPORT const unsigned char libPhoneNumber_iOSVersionString[];

// Metadata
#import "NBMetadataHelper.h"
#import "NBGeocoderMetadataHelper.h"

// Model
#import "NBNumberFormat.h"
Expand Down
18 changes: 5 additions & 13 deletions libPhoneNumber.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
0FC0D36E24A29F680087AFCF /* libPhoneNumberiOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
0FC0D37B24A2A05E0087AFCF /* libPhoneNumberGeocoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FC0D36424A29F510087AFCF /* libPhoneNumberGeocoding.framework */; };
0FC0D38124A2A18D0087AFCF /* NBPhoneNumberOfflineGeocoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 944B9B0B2497EEDC007E17B5 /* NBPhoneNumberOfflineGeocoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
0FC0D38224A2A18F0087AFCF /* NBGeocoderMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 944B9B002497ED79007E17B5 /* NBGeocoderMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
0FC0D38224A2A18F0087AFCF /* NBGeocoderMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 944B9B002497ED79007E17B5 /* NBGeocoderMetadataHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FC0D38324A2A1D30087AFCF /* GeocodingMetadata.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 944B9B1C2497F63B007E17B5 /* GeocodingMetadata.bundle */; };
0FC214DA24D339BD002A5E4B /* libPhoneNumberMetadataForTesting in Resources */ = {isa = PBXBuildFile; fileRef = 0FC214D924D339BD002A5E4B /* libPhoneNumberMetadataForTesting */; };
0FD8755D24D39AB300AB132F /* libPhoneNumberMetadataForTesting in Resources */ = {isa = PBXBuildFile; fileRef = 0FC214D924D339BD002A5E4B /* libPhoneNumberMetadataForTesting */; };
Expand All @@ -42,7 +42,6 @@
34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
34ACBBBC1B7125290064B3BD /* NBMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FD12C2681A87401B00B53856 /* NBMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
34ACBBBD1B7125450064B3BD /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
698F82912546226200CE67D8 /* NBGeocoderMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 944B9B002497ED79007E17B5 /* NBGeocoderMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B0FD2F31E4A85A70049DF81 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B0FD2F21E4A85A70049DF81 /* libz.tbd */; };
8B0FD2F71E4A85AE0049DF81 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B0FD2F21E4A85A70049DF81 /* libz.tbd */; };
8B0FD2FB1E4A88AC0049DF81 /* NSArray+NBAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0FD2F91E4A88AC0049DF81 /* NSArray+NBAdditions.h */; };
Expand All @@ -64,12 +63,9 @@
9439832D24CB569100CF8CB4 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 9439832C24CB569100CF8CB4 /* README.md */; };
944B9B062497ED79007E17B5 /* NBGeocoderMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 944B9B012497ED79007E17B5 /* NBGeocoderMetadataHelper.m */; };
94C9AF0F24B3AAF900469F54 /* NBPhoneNumberOfflineGeocoderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C9AF0E24B3AAF900469F54 /* NBPhoneNumberOfflineGeocoderTest.m */; };
94C9AF5F24B3CE0D00469F54 /* TestingSource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 94C9AF5E24B3CE0D00469F54 /* TestingSource.bundle */; };
94C9AF6024B3CE1000469F54 /* TestingSource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 94C9AF5E24B3CE0D00469F54 /* TestingSource.bundle */; };
94C9AF6124B3E24900469F54 /* NBGeocoderMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 944B9B012497ED79007E17B5 /* NBGeocoderMetadataHelper.m */; };
94C9AF6224B3E24B00469F54 /* NBGeocoderMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 944B9B012497ED79007E17B5 /* NBGeocoderMetadataHelper.m */; };
94C9AF6324B3E25F00469F54 /* NBPhoneNumberOfflineGeocoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 944B9B0C2497EEDC007E17B5 /* NBPhoneNumberOfflineGeocoder.m */; };
A81D6A2B1BECC44600F68F34 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; };
CA55ED89296F51E0005E98A1 /* TestingSource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CA55ED88296F51E0005E98A1 /* TestingSource.bundle */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -183,10 +179,10 @@
94AEB65924C2547000204E11 /* libPhoneNumberShortNumber.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = libPhoneNumberShortNumber.podspec; sourceTree = "<group>"; };
94C9AF0E24B3AAF900469F54 /* NBPhoneNumberOfflineGeocoderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBPhoneNumberOfflineGeocoderTest.m; sourceTree = "<group>"; };
94C9AF5924B3C40C00469F54 /* libPhoneNumberGeocoding.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = libPhoneNumberGeocoding.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
94C9AF5E24B3CE0D00469F54 /* TestingSource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TestingSource.bundle; sourceTree = "<group>"; };
A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NBPhoneNumberDefines.m; sourceTree = "<group>"; };
CA2A40602966543D00DBCD69 /* NBTestingMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBTestingMetaData.h; sourceTree = "<group>"; };
CA2A4061296654E500DBCD69 /* NBTestingMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBTestingMetaData.h; sourceTree = "<group>"; };
CA55ED88296F51E0005E98A1 /* TestingSource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TestingSource.bundle; sourceTree = "<group>"; };
FD12C2681A87401B00B53856 /* NBMetadataHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBMetadataHelper.h; sourceTree = "<group>"; };
FD12C2691A87401B00B53856 /* NBMetadataHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBMetadataHelper.m; sourceTree = "<group>"; };
FD7A0620167715A0004BBEB6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -275,7 +271,6 @@
0FC0D35E24A29EFA0087AFCF /* Metadata */ = {
isa = PBXGroup;
children = (
94C9AF5E24B3CE0D00469F54 /* TestingSource.bundle */,
944B9B1C2497F63B007E17B5 /* GeocodingMetadata.bundle */,
944B9B002497ED79007E17B5 /* NBGeocoderMetadataHelper.h */,
944B9B012497ED79007E17B5 /* NBGeocoderMetadataHelper.m */,
Expand All @@ -301,6 +296,7 @@
children = (
94C9AF0E24B3AAF900469F54 /* NBPhoneNumberOfflineGeocoderTest.m */,
0FC0D37A24A2A05E0087AFCF /* Info.plist */,
CA55ED88296F51E0005E98A1 /* TestingSource.bundle */,
);
path = libPhoneNumberGeocodingTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -495,7 +491,6 @@
34ACBB8A1B7122AC0064B3BD /* libPhoneNumberiOS.h in Headers */,
34ACBBB71B7124BE0064B3BD /* NBPhoneNumber.h in Headers */,
34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtil.h in Headers */,
698F82912546226200CE67D8 /* NBGeocoderMetadataHelper.h in Headers */,
0F2870A21FCF9368006230BF /* NBRegularExpressionCache.h in Headers */,
34ACBBB91B7124DB0064B3BD /* NBPhoneNumberDesc.h in Headers */,
);
Expand Down Expand Up @@ -693,16 +688,15 @@
files = (
9439832824CB545000CF8CB4 /* README.md in Resources */,
0FC0D38324A2A1D30087AFCF /* GeocodingMetadata.bundle in Resources */,
94C9AF5F24B3CE0D00469F54 /* TestingSource.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
0FC0D37424A2A05E0087AFCF /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CA55ED89296F51E0005E98A1 /* TestingSource.bundle in Resources */,
0FD8755E24D39DD900AB132F /* libPhoneNumberMetadataForTesting in Resources */,
94C9AF6024B3CE1000469F54 /* TestingSource.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -753,8 +747,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
94C9AF6324B3E25F00469F54 /* NBPhoneNumberOfflineGeocoder.m in Sources */,
94C9AF6224B3E24B00469F54 /* NBGeocoderMetadataHelper.m in Sources */,
94C9AF0F24B3AAF900469F54 /* NBPhoneNumberOfflineGeocoderTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
4 changes: 2 additions & 2 deletions libPhoneNumberGeocoding.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ DESC
s.license = 'Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
s.authors = { "rastaarh" => "rastaar@google.com", "paween" => "paween@google.com", "aalexli" => "aalexli@google.com" }
s.source = { :git => "https://github.com/iziz/libPhoneNumber-iOS.git", :tag => s.version.to_s }
s.libraries = 'z'
s.libraries = 'sqlite3'
s.ios.deployment_target = "11.0"
s.osx.deployment_target = "10.9"
s.watchos.deployment_target = "4.0"
s.tvos.deployment_target = "11.0"
s.requires_arc = true
s.resources = "libPhoneNumberGeocoding/Metadata/*.bundle"
s.private_header_files = 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h'
s.private_header_files = 'libPhoneNumberGeocoding/Metadata/NBGeocoderMetadataHelper.h'
s.dependency 'libPhoneNumber-iOS'
s.source_files = 'libPhoneNumberGeocoding/NBPhoneNumberOfflineGeocoder.{h,m}', 'libPhoneNumberGeocoding/Metadata/NBGeocoderMetadataHelper.{h,m}'
end
2 changes: 1 addition & 1 deletion libPhoneNumberGeocoding/Metadata/NBGeocoderMetadataHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <sqlite3.h>

#import "libPhoneNumberiOS/NBGeocoderMetadataHelper.h"
#import "NBGeocoderMetadataHelper.h"
#import "NBPhoneNumber.h"

@implementation NBGeocoderMetadataHelper {
Expand Down
2 changes: 1 addition & 1 deletion libPhoneNumberGeocoding/NBPhoneNumberOfflineGeocoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

#import <Foundation/Foundation.h>
#import <libPhoneNumberGeocoding/NBGeocoderMetadataHelper.h>

@class NBGeocoderMetadataHelper;
@class NBPhoneNumber;
@class NBPhoneNumberUtil;

Expand Down
2 changes: 1 addition & 1 deletion libPhoneNumberGeocoding/NBPhoneNumberOfflineGeocoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 Google LLC. All rights reserved.
//

#import "Metadata/NBGeocoderMetadataHelper.h"
#import "NBPhoneNumberOfflineGeocoder.h"
#import "libPhoneNumberiOS/NBGeocoderMetadataHelper.h"
#import "NBPhoneNumber.h"
#import "NBPhoneNumberUtil.h"

Expand Down
1 change: 1 addition & 0 deletions libPhoneNumberGeocodingTests/NBPhoneNumberOfflineGeocoderTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#import <XCTest/XCTest.h>

#import "NBGeocoderMetadataHelper.h"
#import "NBMetadataHelper.h"
#import "NBPhoneNumber.h"
#import "NBPhoneNumberOfflineGeocoder.h"
Expand Down
0 ...oding/Metadata/TestingSource.bundle/de.db → ...GeocodingTests/TestingSource.bundle/de.db
View file
Open in desktop
File renamed without changes.
0 ...oding/Metadata/TestingSource.bundle/en.db → ...GeocodingTests/TestingSource.bundle/en.db
View file
Open in desktop
File renamed without changes.
0 ...oding/Metadata/TestingSource.bundle/it.db → ...GeocodingTests/TestingSource.bundle/it.db
View file
Open in desktop
File renamed without changes.
0 ...oding/Metadata/TestingSource.bundle/ko.db → ...GeocodingTests/TestingSource.bundle/ko.db
View file
Open in desktop
File renamed without changes.