From 6892311b36f48eb2b1935d7299cba52ce298606d Mon Sep 17 00:00:00 2001 From: samuel susla Date: Sun, 6 Dec 2015 17:14:20 +0100 Subject: [PATCH 01/23] platform support --- Pluralize.swift.podspec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index d7eec64..159a6f8 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Pluralize.swift" - s.version = "1.0" + s.version = '1.1' s.summary = "Great Swift String Pluralize Extension" # This description is used to generate tags and improve search results. @@ -18,14 +18,17 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = "case-insensitive, tons of rules for irregular nouns (plural form), supports uncountable nouns, allows dynamic addition of rules" - s.homepage = "https://github.com/joshualat/Pluralize.swift" + s.homepage = "https://github.com/sammy-SC/Pluralize.swift.git" # s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2" s.license = 'MIT' s.author = { "Joshua Arvin Lat" => "unknown" } - s.source = { :git => "https://github.com/joshualat/Pluralize.swift.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} - s.platform = :ios, '8.0' s.requires_arc = true + s.watchos.deployment_target = '2.0' + s.ios.deployment_target = '8.0' + s.osx.deployment_target = '10.9' + s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' s.resource_bundles = { From 31c7a4cd114ad4efbd4f1161bd4cbcd05b841d25 Mon Sep 17 00:00:00 2001 From: samuel susla Date: Sun, 6 Dec 2015 17:32:32 +0100 Subject: [PATCH 02/23] podspec --- Pluralize.swift.podspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 159a6f8..529844c 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -25,10 +25,11 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} s.requires_arc = true - s.watchos.deployment_target = '2.0' + s.watchos.platform = '2.0' + s.ios.platform = '8.0' s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.9' - s.tvos.deployment_target = '9.0' + s.osx.platform = '10.9' + s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' s.resource_bundles = { From 2a31829be778a2ef7e01762230343ce418c13063 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 20:14:24 -0600 Subject: [PATCH 03/23] Added a deployment target for osx, to fix cocoapods not seeing the pltform as supported after reading over some of the cocoapods issues on github. --- Pluralize.swift.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 529844c..2fe91b8 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -29,6 +29,7 @@ Pod::Spec.new do |s| s.ios.platform = '8.0' s.ios.deployment_target = '8.0' s.osx.platform = '10.9' + s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' From 1108a3ba0a2328b8d33930c42e68d263af992fd2 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 20:42:52 -0600 Subject: [PATCH 04/23] Removed the s.resources directive, it was trying to copy pngs that dont exist. Causes build to fail on OSX. The original project had no pngs, nor should it rely on them so this should be safe to remove. --- Pluralize.swift.podspec | 3 --- 1 file changed, 3 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 2fe91b8..3b0069e 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -33,7 +33,4 @@ Pod::Spec.new do |s| s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' - s.resource_bundles = { - 'Pluralize.swift' => ['Pod/Assets/*.png'] - } end From 96b75d513625d48c61d8b398624e9b629eb13ea2 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:05:05 -0600 Subject: [PATCH 05/23] Added deployment targets for tvos --- Pluralize.swift.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 3b0069e..287a08a 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -31,6 +31,6 @@ Pod::Spec.new do |s| s.osx.platform = '10.9' s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' - + s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' end From 882d41665a8c3697faabe02fbededcd80b686487 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:17:22 -0600 Subject: [PATCH 06/23] I think the resource copy should be for the plist file I had to manually copy to get it to work. --- Pluralize.swift.podspec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 287a08a..adae242 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -33,4 +33,7 @@ Pod::Spec.new do |s| s.tvos.platform = '9.0' s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' + s.resource_bundles = { + 'Pluralize.swift' => ['Pod/*.plist'] + } end From f5591709b97edb040e216e8c35468fd22186a86e Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:23:49 -0600 Subject: [PATCH 07/23] Last assumption was incorrect, but more searching of cocoapods issues makes the think it was the source argument catching the plist when it shouldnt. --- Pluralize.swift.podspec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index adae242..9efb150 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -32,8 +32,5 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' s.tvos.deployment_target = '9.0' - s.source_files = 'Pluralize/*' - s.resource_bundles = { - 'Pluralize.swift' => ['Pod/*.plist'] - } + s.source_files = 'Pluralize/*.swift' end From 509cbe73b8993775c8ff1e2b9993f09b26177c12 Mon Sep 17 00:00:00 2001 From: samuel susla Date: Sun, 6 Dec 2015 17:14:20 +0100 Subject: [PATCH 08/23] platform support Co-authored-by: Ben Summers --- Pluralize.swift.podspec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index d7eec64..159a6f8 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Pluralize.swift" - s.version = "1.0" + s.version = '1.1' s.summary = "Great Swift String Pluralize Extension" # This description is used to generate tags and improve search results. @@ -18,14 +18,17 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = "case-insensitive, tons of rules for irregular nouns (plural form), supports uncountable nouns, allows dynamic addition of rules" - s.homepage = "https://github.com/joshualat/Pluralize.swift" + s.homepage = "https://github.com/sammy-SC/Pluralize.swift.git" # s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2" s.license = 'MIT' s.author = { "Joshua Arvin Lat" => "unknown" } - s.source = { :git => "https://github.com/joshualat/Pluralize.swift.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} - s.platform = :ios, '8.0' s.requires_arc = true + s.watchos.deployment_target = '2.0' + s.ios.deployment_target = '8.0' + s.osx.deployment_target = '10.9' + s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' s.resource_bundles = { From 0bbc5926925b2821fc7c8db565a160c01cfa937c Mon Sep 17 00:00:00 2001 From: samuel susla Date: Sun, 6 Dec 2015 17:32:32 +0100 Subject: [PATCH 09/23] podspec Co-authored-by: Paul Zabelin --- Pluralize.swift.podspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 159a6f8..529844c 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -25,10 +25,11 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} s.requires_arc = true - s.watchos.deployment_target = '2.0' + s.watchos.platform = '2.0' + s.ios.platform = '8.0' s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.9' - s.tvos.deployment_target = '9.0' + s.osx.platform = '10.9' + s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' s.resource_bundles = { From bbea3b4daf235e855e16e87b00140a135057ac6f Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 20:14:24 -0600 Subject: [PATCH 10/23] Added a deployment target for osx, to fix cocoapods not seeing the pltform as supported after reading over some of the cocoapods issues on github. Co-authored-by: Ben Summers --- Pluralize.swift.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 529844c..2fe91b8 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -29,6 +29,7 @@ Pod::Spec.new do |s| s.ios.platform = '8.0' s.ios.deployment_target = '8.0' s.osx.platform = '10.9' + s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' From c2eb0bbfea5e0e1b85fadb2492b2e3fe9cdd4e35 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 20:42:52 -0600 Subject: [PATCH 11/23] Removed the s.resources directive, it was trying to copy pngs that dont exist. Causes build to fail on OSX. The original project had no pngs, nor should it rely on them so this should be safe to remove. Co-authored-by: Paul Zabelin --- Pluralize.swift.podspec | 3 --- 1 file changed, 3 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 2fe91b8..3b0069e 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -33,7 +33,4 @@ Pod::Spec.new do |s| s.tvos.platform = '9.0' s.source_files = 'Pluralize/*' - s.resource_bundles = { - 'Pluralize.swift' => ['Pod/Assets/*.png'] - } end From 0547cf8564586586ff90641f6e0a9e915188f7c0 Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:05:05 -0600 Subject: [PATCH 12/23] Added deployment targets for tvos Co-authored-by: Ben Summers --- Pluralize.swift.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 3b0069e..287a08a 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -31,6 +31,6 @@ Pod::Spec.new do |s| s.osx.platform = '10.9' s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' - + s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' end From a100a7586d7115112a736f8aff597ca50ef58b0f Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:17:22 -0600 Subject: [PATCH 13/23] I think the resource copy should be for the plist file I had to manually copy to get it to work. Co-authored-by: Paul Zabelin --- Pluralize.swift.podspec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 287a08a..adae242 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -33,4 +33,7 @@ Pod::Spec.new do |s| s.tvos.platform = '9.0' s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*' + s.resource_bundles = { + 'Pluralize.swift' => ['Pod/*.plist'] + } end From 4d3b402e37e0878a78d7e6ddf494bc0dce1e367f Mon Sep 17 00:00:00 2001 From: Jimmy Hough Jr <=> Date: Sun, 6 Dec 2015 21:23:49 -0600 Subject: [PATCH 14/23] Last assumption was incorrect, but more searching of cocoapods issues makes the think it was the source argument catching the plist when it shouldnt. Co-authored-by: Ben Summers --- Pluralize.swift.podspec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index adae242..9efb150 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -32,8 +32,5 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' s.tvos.platform = '9.0' s.tvos.deployment_target = '9.0' - s.source_files = 'Pluralize/*' - s.resource_bundles = { - 'Pluralize.swift' => ['Pod/*.plist'] - } + s.source_files = 'Pluralize/*.swift' end From 5b039cd4316e7ed3dd5a801ed80e51897ee49bad Mon Sep 17 00:00:00 2001 From: Ben Summers Date: Wed, 12 May 2021 16:16:34 -0700 Subject: [PATCH 15/23] set swift version to 4.0 Co-authored-by: Paul Zabelin --- Pluralize.xcodeproj/project.pbxproj | 12 +++++------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 Pluralize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Pluralize.xcodeproj/project.pbxproj b/Pluralize.xcodeproj/project.pbxproj index cdf4e1b..bc45f95 100644 --- a/Pluralize.xcodeproj/project.pbxproj +++ b/Pluralize.xcodeproj/project.pbxproj @@ -169,7 +169,6 @@ TargetAttributes = { 93198B011A4FE442009D2787 = { CreatedOnToolsVersion = 6.1.1; - DevelopmentTeam = V6N86766T9; LastSwiftMigration = 0800; }; 93198B0C1A4FE442009D2787 = { @@ -183,6 +182,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 93198AF81A4FE442009D2787; @@ -287,6 +287,7 @@ SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; @@ -331,6 +332,7 @@ SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; @@ -345,7 +347,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = V6N86766T9; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -357,7 +359,6 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -367,7 +368,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = V6N86766T9; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -378,7 +379,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -397,7 +397,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.joshualat.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -412,7 +411,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.joshualat.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Pluralize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Pluralize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Pluralize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 55b669ff0a2a3a7cd96291f2173f068fadafdd3f Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Wed, 12 May 2021 16:18:17 -0700 Subject: [PATCH 16/23] upgrade to recommended settings Co-authored-by: Ben Summers --- Pluralize.xcodeproj/project.pbxproj | 30 +++++++++++++++---- .../xcschemes/Pluralize-iOS.xcscheme | 6 +--- .../xcshareddata/xcschemes/Pluralize.xcscheme | 24 +++++++-------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/Pluralize.xcodeproj/project.pbxproj b/Pluralize.xcodeproj/project.pbxproj index bc45f95..64753bc 100644 --- a/Pluralize.xcodeproj/project.pbxproj +++ b/Pluralize.xcodeproj/project.pbxproj @@ -164,7 +164,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Joshua Lat"; TargetAttributes = { 93198B011A4FE442009D2787 = { @@ -179,11 +179,11 @@ }; buildConfigurationList = 93198AFC1A4FE442009D2787 /* Build configuration list for PBXProject "Pluralize" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 93198AF81A4FE442009D2787; productRefGroup = 93198B031A4FE442009D2787 /* Products */; @@ -246,18 +246,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -281,7 +291,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -299,18 +309,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -327,7 +347,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; diff --git a/Pluralize.xcodeproj/xcshareddata/xcschemes/Pluralize-iOS.xcscheme b/Pluralize.xcodeproj/xcshareddata/xcschemes/Pluralize-iOS.xcscheme index 0ec5f3b..51a09d5 100644 --- a/Pluralize.xcodeproj/xcshareddata/xcschemes/Pluralize-iOS.xcscheme +++ b/Pluralize.xcodeproj/xcshareddata/xcschemes/Pluralize-iOS.xcscheme @@ -1,6 +1,6 @@ - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - Date: Wed, 12 May 2021 16:19:20 -0700 Subject: [PATCH 17/23] migrate to swift 5 Co-authored-by: Ben Summers --- Pluralize.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Pluralize.xcodeproj/project.pbxproj b/Pluralize.xcodeproj/project.pbxproj index 64753bc..1f50bda 100644 --- a/Pluralize.xcodeproj/project.pbxproj +++ b/Pluralize.xcodeproj/project.pbxproj @@ -169,11 +169,11 @@ TargetAttributes = { 93198B011A4FE442009D2787 = { CreatedOnToolsVersion = 6.1.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1250; }; 93198B0C1A4FE442009D2787 = { CreatedOnToolsVersion = 6.1.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1250; }; }; }; @@ -297,7 +297,7 @@ SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; @@ -352,7 +352,7 @@ SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; From 251f9e667887ad9477273e2333b9993d537f6674 Mon Sep 17 00:00:00 2001 From: Ben Summers Date: Wed, 12 May 2021 16:27:26 -0700 Subject: [PATCH 18/23] add podspec to xcode project Co-authored-by: Paul Zabelin --- Pluralize.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Pluralize.xcodeproj/project.pbxproj b/Pluralize.xcodeproj/project.pbxproj index 1f50bda..7809fd6 100644 --- a/Pluralize.xcodeproj/project.pbxproj +++ b/Pluralize.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 4A684448264C9B2C002E3ECE /* Pluralize.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = Pluralize.swift.podspec; sourceTree = SOURCE_ROOT; }; 93198B021A4FE442009D2787 /* Pluralize.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pluralize.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 93198B061A4FE442009D2787 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 93198B071A4FE442009D2787 /* Pluralize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Pluralize.h; sourceTree = ""; }; @@ -85,6 +86,7 @@ isa = PBXGroup; children = ( 93198B061A4FE442009D2787 /* Info.plist */, + 4A684448264C9B2C002E3ECE /* Pluralize.swift.podspec */, ); name = "Supporting Files"; sourceTree = ""; From 6b1dcfabdfa58923e99f18b7cb4ad0a8ce6ffee5 Mon Sep 17 00:00:00 2001 From: Ben Summers Date: Wed, 12 May 2021 17:04:54 -0700 Subject: [PATCH 19/23] fix characters deprecated error --- Pluralize/Pluralize.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Pluralize/Pluralize.swift b/Pluralize/Pluralize.swift index 92d9d3b..c03c3e9 100644 --- a/Pluralize/Pluralize.swift +++ b/Pluralize/Pluralize.swift @@ -134,7 +134,7 @@ public class Pluralize { } public class func apply(word: String) -> String { - guard !(sharedInstance.uncountables.contains(word.lowercased()) || word.characters.count == 0) else { + guard !(sharedInstance.uncountables.contains(word.lowercased()) || word.count == 0) else { return word } @@ -166,7 +166,7 @@ public class Pluralize { private class func regexReplace(input: String, pattern: String, template: String) -> String { let regex = try! NSRegularExpression(pattern: pattern, options: .caseInsensitive) - let range = NSRange(location: 0, length: input.characters.count) + let range = NSRange(location: 0, length: input.count) let output = regex.stringByReplacingMatches(in: input, options: [], range: range, withTemplate: template) return output } @@ -193,6 +193,6 @@ extension String { // Workaround to allow us to use `count` as an argument name in pluralize() above. private var length: Int { - return self.characters.count + return self.count } } From 7aaf3386402b632e0c8b7c6823d113aaa18094c0 Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Wed, 12 May 2021 17:49:18 -0700 Subject: [PATCH 20/23] fix podspec syntax --- Pluralize.swift.podspec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 9efb150..ffb0e10 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -25,12 +25,9 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} s.requires_arc = true - s.watchos.platform = '2.0' - s.ios.platform = '8.0' + s.watchos.deployment_target = '2.0' s.ios.deployment_target = '8.0' - s.osx.platform = '10.9' s.osx.deployment_target = '10.9' - s.tvos.platform = '9.0' s.tvos.deployment_target = '9.0' s.source_files = 'Pluralize/*.swift' end From d28a11797f0047ba702ced4cde241b51837e09b6 Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Wed, 12 May 2021 17:51:48 -0700 Subject: [PATCH 21/23] specify swift version --- Pluralize.swift.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index ffb0e10..202db67 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -25,6 +25,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} s.requires_arc = true + s.swift_version = '5.0' s.watchos.deployment_target = '2.0' s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' From 17a9becc65e091903ed918bc841bf13834f49d6d Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Wed, 12 May 2021 17:52:21 -0700 Subject: [PATCH 22/23] use ruby for podspec --- Pluralize.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pluralize.xcodeproj/project.pbxproj b/Pluralize.xcodeproj/project.pbxproj index 7809fd6..37cfdd6 100644 --- a/Pluralize.xcodeproj/project.pbxproj +++ b/Pluralize.xcodeproj/project.pbxproj @@ -25,7 +25,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 4A684448264C9B2C002E3ECE /* Pluralize.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = Pluralize.swift.podspec; sourceTree = SOURCE_ROOT; }; + 4A684448264C9B2C002E3ECE /* Pluralize.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = Pluralize.swift.podspec; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 93198B021A4FE442009D2787 /* Pluralize.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pluralize.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 93198B061A4FE442009D2787 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 93198B071A4FE442009D2787 /* Pluralize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Pluralize.h; sourceTree = ""; }; From d634ce882f7b768a2220ae1439980d2da32a50a2 Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Wed, 12 May 2021 18:10:26 -0700 Subject: [PATCH 23/23] restore forked podspec metadata --- Pluralize.swift.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Pluralize.swift.podspec b/Pluralize.swift.podspec index 202db67..016aee9 100644 --- a/Pluralize.swift.podspec +++ b/Pluralize.swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Pluralize.swift" - s.version = '1.1' + s.version = "1.0" s.summary = "Great Swift String Pluralize Extension" # This description is used to generate tags and improve search results. @@ -18,11 +18,11 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = "case-insensitive, tons of rules for irregular nouns (plural form), supports uncountable nouns, allows dynamic addition of rules" - s.homepage = "https://github.com/sammy-SC/Pluralize.swift.git" + s.homepage = "https://github.com/joshualat/Pluralize.swift" # s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2" s.license = 'MIT' s.author = { "Joshua Arvin Lat" => "unknown" } - s.source = { :git => "https://github.com/sammy-SC/Pluralize.swift.git", :tag => '1.1'} + s.source = { :git => "https://github.com/joshualat/Pluralize.swift.git", :tag => s.version.to_s } s.requires_arc = true s.swift_version = '5.0'