Merge pull request #379 from egoldfarb/master

Build files cleanup
iziz · Jan 10, 2023 · fd75124 · fd75124
2 parents 243e3cb + 331403e
commit fd75124
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 131 deletions.
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
  .target(
  name: "libPhoneNumber",
  path: "libPhoneNumber",
- exclude: ["GeneratePhoneNumberHeader.sh", "NBPhoneNumberMetadata.plist", "Info.plist"],
+ exclude: ["GeneratePhoneNumberHeader.sh", "Info.plist"],
  publicHeadersPath: ".",
  cSettings: [
  .headerSearchPath("Internal")
@@ -27,10 +27,7 @@ let package = Package(
  sources: [
  "NBAsYouTypeFormatterTest.m",
  "NBPhoneNumberParsingPerfTest.m",
- "NBPhoneNumberUtil+ShortNumberTestHelper.h",
- "NBPhoneNumberUtil+ShortNumberTestHelper.m",
  "NBPhoneNumberUtilTest.m",
- "NBShortNumberInfoTest.m"
  ]
  )
  ]

diff --git a/[email protected] b/[email protected]
@@ -6,9 +6,9 @@ let package = Package(
  name: "libPhoneNumber",
  platforms: [
  .macOS(.v10_10),
- .iOS(.v9),
- .tvOS(.v9),
- .watchOS(.v2)
+ .iOS(.v11),
+ .tvOS(.v11),
+ .watchOS(.v4)
  ],
  products: [
  .library(
@@ -20,7 +20,7 @@ let package = Package(
  .target(
  name: "libPhoneNumber",
  path: "libPhoneNumber",
- exclude: ["GeneratePhoneNumberHeader.sh", "NBPhoneNumberMetadata.plist", "Info.plist"],
+ exclude: ["GeneratePhoneNumberHeader.sh", "Info.plist"],
  publicHeadersPath: ".",
  cSettings: [
  .headerSearchPath("Internal")
@@ -36,10 +36,7 @@ let package = Package(
  sources: [
  "NBAsYouTypeFormatterTest.m",
  "NBPhoneNumberParsingPerfTest.m",
- "NBPhoneNumberUtil+ShortNumberTestHelper.h",
- "NBPhoneNumberUtil+ShortNumberTestHelper.m",
  "NBPhoneNumberUtilTest.m",
- "NBShortNumberInfoTest.m"
  ]
  )
  ]

diff --git a/[email protected] b/[email protected]
@@ -7,9 +7,9 @@ let package = Package(
  platforms: [
  .macOS(.v10_10),
  .macCatalyst(.v13),
- .iOS(.v9),
- .tvOS(.v9),
- .watchOS(.v2)
+ .iOS(.v11),
+ .tvOS(.v11),
+ .watchOS(.v4)
  ],
  products: [
  .library(
@@ -21,7 +21,7 @@ let package = Package(
  .target(
  name: "libPhoneNumber",
  path: "libPhoneNumber",
- exclude: ["GeneratePhoneNumberHeader.sh", "NBPhoneNumberMetadata.plist", "Info.plist"],
+ exclude: ["GeneratePhoneNumberHeader.sh", "Info.plist"],
  publicHeadersPath: ".",
  cSettings: [
  .headerSearchPath("Internal")
@@ -37,10 +37,7 @@ let package = Package(
  sources: [
  "NBAsYouTypeFormatterTest.m",
  "NBPhoneNumberParsingPerfTest.m",
- "NBPhoneNumberUtil+ShortNumberTestHelper.h",
- "NBPhoneNumberUtil+ShortNumberTestHelper.m",
  "NBPhoneNumberUtilTest.m",
- "NBShortNumberInfoTest.m"
  ]
  )
  ]

diff --git a/libPhoneNumber-iOS.podspec b/libPhoneNumber-iOS.podspec
@@ -12,10 +12,10 @@ DESC
  s.source = { :git => "https://github.com/iziz/libPhoneNumber-iOS.git", :tag => s.version.to_s }
  s.libraries = 'z'
  s.ios.framework = 'CoreTelephony'
- s.ios.deployment_target = "10.0"
+ s.ios.deployment_target = "11.0"
  s.osx.deployment_target = "10.9"
  s.watchos.deployment_target = "4.0"
- s.tvos.deployment_target = "10.0"
+ s.tvos.deployment_target = "11.0"
  s.requires_arc = true
  s.private_header_files = 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h'
  s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h', 'libPhoneNumber/Internal/NBRegExMatcher.{h,m}', 'libPhoneNumber/Internal/NBRegularExpressionCache.{h,m}'

diff --git a/libPhoneNumber.xcodeproj/project.pbxproj b/libPhoneNumber.xcodeproj/project.pbxproj
@@ -187,7 +187,6 @@
  A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NBPhoneNumberDefines.m; 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>"; };
- FD379E291A8AE5150015C184 /* NBPhoneNumberMetadata.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = NBPhoneNumberMetadata.plist; sourceTree = "<group>"; };
  FD7A0620167715A0004BBEB6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
  FD7A0622167715A0004BBEB6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
  FD7A0624167715A0004BBEB6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -460,7 +459,6 @@
  FD12C2681A87401B00B53856 /* NBMetadataHelper.h */,
  FD12C2691A87401B00B53856 /* NBMetadataHelper.m */,
  8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */,
- FD379E291A8AE5150015C184 /* NBPhoneNumberMetadata.plist */,
  );
  name = Metadata;
  sourceTree = "<group>";
@@ -862,7 +860,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberGeocoding/Info.plist;
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -908,7 +906,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberGeocoding/Info.plist;
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1010,15 +1008,10 @@
  DEBUG_INFORMATION_FORMAT = dwarf;
  GCC_GENERATE_TEST_COVERAGE_FILES = NO;
  GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "TESTING=1",
- SHORT_NUMBER_SUPPORT,
- );
  GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberTests/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1046,14 +1039,10 @@
  ENABLE_NS_ASSERTIONS = NO;
  GCC_GENERATE_TEST_COVERAGE_FILES = NO;
  GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "TESTING=1",
- SHORT_NUMBER_SUPPORT,
- );
  GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberTests/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1086,17 +1075,13 @@
  DYLIB_INSTALL_NAME_BASE = "@rpath";
  ENABLE_STRICT_OBJC_MSGSEND = YES;
  GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
  GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
  GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
  GCC_WARN_UNDECLARED_SELECTOR = YES;
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = "libPhoneNumber-iOS/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1147,7 +1132,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = "libPhoneNumber-iOS/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1193,7 +1178,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberShortNumber/Info.plist;
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1238,7 +1223,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  INFOPLIST_FILE = libPhoneNumberShortNumber/Info.plist;
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",

diff --git a/libPhoneNumber/NBPhoneNumberMetadata.plist b/libPhoneNumber/NBPhoneNumberMetadata.plist
diff --git a/libPhoneNumberGeocoding.podspec b/libPhoneNumberGeocoding.podspec
@@ -11,10 +11,10 @@ DESC
  s.authors = { "rastaarh" => "[email protected]", "paween" => "[email protected]", "aalexli" => "[email protected]" }
  s.source = { :git => "https://github.com/iziz/libPhoneNumber-iOS.git", :tag => s.version.to_s }
  s.libraries = 'z'
- s.ios.deployment_target = "10.0"
+ s.ios.deployment_target = "11.0"
  s.osx.deployment_target = "10.9"
  s.watchos.deployment_target = "4.0"
- s.tvos.deployment_target = "10.0"
+ s.tvos.deployment_target = "11.0"
  s.requires_arc = true
  s.resources = "libPhoneNumberGeocoding/Metadata/*.bundle"
  s.private_header_files = 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h'

diff --git a/libPhoneNumberShortNumber.podspec b/libPhoneNumberShortNumber.podspec
@@ -11,10 +11,10 @@ DESC
  s.authors = { "rastaarh" => "[email protected]", "paween" => "[email protected]"}
  s.source = { :git => "https://github.com/iziz/libPhoneNumber-iOS.git", :tag => s.version.to_s }
  s.libraries = 'z'
- s.ios.deployment_target = "10.0"
+ s.ios.deployment_target = "11.0"
  s.osx.deployment_target = "10.9"
  s.watchos.deployment_target = "4.0"
- s.tvos.deployment_target = "10.0"
+ s.tvos.deployment_target = "11.0"
  s.requires_arc = true
  s.private_header_files = 'libPhoneNumberShortNumber/NBGeneratedShortNumberMetadata.h'
  s.dependency 'libPhoneNumber-iOS'

diff --git a/libPhoneNumberShortNumberTests/NBShortNumberInfoTest.m b/libPhoneNumberShortNumberTests/NBShortNumberInfoTest.m
@@ -14,7 +14,6 @@
 #import "NBPhoneNumberDesc.h"
 #import "NBShortNumberUtil.h"
 
-#import "NBGeneratedShortNumberMetadata.h"
 #import "NBShortNumberMetadataHelper.h"
 #import "NBShortNumberTestHelper.h"
 

diff --git a/libPhoneNumberShortNumberTests/NBShortNumberTestHelper.m b/libPhoneNumberShortNumberTests/NBShortNumberTestHelper.m
@@ -6,7 +6,7 @@
 // Copyright © 2017 Google LLC. All rights reserved.
 //
 #import "NBShortNumberTestHelper.h"
-#import "NBPhoneMetadata.h"
+#import "NBPhoneMetaData.h"
 #import "NBPhoneNumberDesc.h"
 #import "NBShortNumberMetadataHelper.h"
 #import "NBShortNumberUtil.h"

diff --git a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.h b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.h
diff --git a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.m b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.m