GoogleUtilities - Standardize imports and add LICENSE (#4655)

Author: paulb777

GoogleUtilities.podspec

@@ -9,7 +9,7 @@ other Google CocoaPods. They're not intended for direct public usage.
                        DESC
 
   s.homepage         = 'https://github.com/firebase/firebase-ios-sdk/tree/master/GoogleUtilities'
-  s.license          = { :type => 'Apache', :file => 'LICENSE' }
+  s.license          = { :type => 'Apache', :file => 'GoogleUtilities/LICENSE' }
   s.authors          = 'Google, Inc.'
 
   s.source           = {
@@ -25,6 +25,11 @@ other Google CocoaPods. They're not intended for direct public usage.
   s.cocoapods_version = '>= 1.4.0'
   s.prefix_header_file = false
 
+  s.pod_target_xcconfig = {
+    'GCC_C_LANGUAGE_STANDARD' => 'c99',
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+  }
+
   s.subspec 'Environment' do |es|
     es.source_files = 'GoogleUtilities/Environment/**/*.[mh]'
     es.public_header_files = 'GoogleUtilities/Environment/**/*.h'

GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "TargetConditionals.h"
+#import <TargetConditionals.h>
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULLogger.h>
 #import <GoogleUtilities/GULMutableDictionary.h>
-#import "../Common/GULLoggerCodes.h"
-#import "Internal/GULAppDelegateSwizzler_Private.h"
+#import "GoogleUtilities/AppDelegateSwizzler/Internal/GULAppDelegateSwizzler_Private.h"
+#import "GoogleUtilities/Common/GULLoggerCodes.h"
 
 #import <objc/runtime.h>
 

GoogleUtilities/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Unreleased
+- Standardized import paths. (#4655)
+
+# 6.5.0
+- Swizzler changes.
+
 # 6.4.0
 - Add function to gul secure encoding to encode multiple classes. (#4282)
 - Add heartbeat feature. (#4098)

GoogleUtilities/CMakeLists.txt

@@ -38,6 +38,7 @@ if(APPLE)
     INCLUDES
       Private
       Public
+      ${PROJECT_SOURCE_DIR}
     DEPENDS
       "-framework Foundation"
     EXCLUDE_FROM_ALL

GoogleUtilities/Environment/GULSecureCoding.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "Public/GULSecureCoding.h"
+#import "GoogleUtilities/Environment/Public/GULSecureCoding.h"
 
 NSString *const kGULSecureCodingError = @"GULSecureCodingError";
 

GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "GULAppEnvironmentUtil.h"
+#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h"
 
 #import <Foundation/Foundation.h>
 #import <dlfcn.h>

GoogleUtilities/Example/Tests/Network/GULNetworkTest.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "GTMHTTPServer.h"
+#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h"
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>

GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.m

@@ -51,7 +51,7 @@
 #import <unistd.h>
 
 #define GTMHTTPSERVER_DEFINE_GLOBALS
-#import "GTMHTTPServer.h"
+#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h"
 
 // avoid some of GTM's promiscuous dependencies
 #ifndef _GTMDevLog

GoogleUtilities/Example/Tests/Reachability/GULReachabilityCheckerTest.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "GULReachabilityChecker+Internal.h"
+#import "GoogleUtilities/Reachability/GULReachabilityChecker+Internal.h"
 
 @interface GULReachabilityCheckerTest : XCTestCase <GULReachabilityDelegate> {
  @private

GoogleUtilities/Example/Tests/Swizzler/GULAppDelegateSwizzlerTest.m

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
-#import "GULAppDelegateSwizzler_Private.h"
+#import "GoogleUtilities/AppDelegateSwizzler/Internal/GULAppDelegateSwizzler_Private.h"
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>