Merge branch 'master' of github.com:ElfSundae/ESFramework

Author: ElfSundae

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 3.27.1 (2021-11-07)
+
+- Add new device models: MacBook Pro (16-inch, 2021), MacBook Pro (14-inch, 2021)
+
+## 3.27.0 (2021-10-18)
+
+- Change `-[NSURL queryParameters]` to `-[NSURL es_queryParameters]`
+
 ## 3.26.3 (2021-09-23)
 
 - Add new device models: iMac 2021, iPad 2021, iPhone 13 series

ESFramework.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = 'ESFramework'
-  s.version     = '3.26.3'
+  s.version     = '3.27.1'
   s.license     = 'MIT'
   s.summary     = 'An efficient, lightweight foundational framework for iOS, macOS, tvOS, watchOS, and Mac Catalyst.'
   s.homepage    = 'https://github.com/ElfSundae/ESFramework'

ESFramework.xcodeproj/project.pbxproj

@@ -1323,7 +1323,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ES;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = "https://0x123.com";
 				TargetAttributes = {
 					1897B45673710FD9ED699BFD = {
@@ -2051,7 +2051,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.26.3;
+				MARKETING_VERSION = 3.27.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2130,7 +2130,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.26.3;
+				MARKETING_VERSION = 3.27.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;

ESFramework.xcodeproj/xcshareddata/xcschemes/ESFramework_iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/ESFramework_macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/ESFramework_tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/ESFramework_watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/macOS Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/tvOS Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework.xcodeproj/xcshareddata/xcschemes/watchOS Example Extension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

ESFramework.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ESFramework/Foundation/NSURL+ESExtension.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Returns the URL query parameters.
  */
-- (nullable NSDictionary<NSString *, id> *)queryParameters;
+- (nullable NSDictionary<NSString *, id> *)es_queryParameters;
 
 /**
  * Returns a newly created URL added the given query parameters.

ESFramework/Foundation/NSURL+ESExtension.m

@@ -11,7 +11,7 @@
 
 @implementation NSURL (ESExtension)
 
-- (NSDictionary<NSString *, id> *)queryParameters
+- (NSDictionary<NSString *, id> *)es_queryParameters
 {
     return [NSURLComponents componentsWithURL:self resolvingAgainstBaseURL:YES].queryParameters;
 }

project.yml

@@ -17,7 +17,7 @@ attributes:
   ORGANIZATIONNAME: 'https://0x123.com'
 
 settings:
-  MARKETING_VERSION: 3.26.3
+  MARKETING_VERSION: 3.27.1
   CURRENT_PROJECT_VERSION: 3
   # Fix warning for Xcode 11.3: Enable "Missing Localizability"
   CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: YES