Renaming SPM name.

Author: jeffctown

OHHTTPStubs.podspec

@@ -45,20 +45,20 @@ Pod::Spec.new do |s|
 
   # The Core subspec, containing the library core needed in all cases
   s.subspec 'Core' do |core|
-    core.source_files = "Sources/OHHTTPStubsCore/**/HTTPStubs.{h,m}", "Sources/OHHTTPStubsCore/**/OHHTTPStubsResponse.{h,m}",
-        "Sources/OHHTTPStubsCore/include/Compatibility.h"
+    core.source_files = "Sources/OHHTTPStubs/**/HTTPStubs.{h,m}", "Sources/OHHTTPStubs/**/OHHTTPStubsResponse.{h,m}",
+        "Sources/OHHTTPStubs/include/Compatibility.h"
   end
 
   # Optional subspecs
   s.subspec 'NSURLSession' do |urlsession|
     urlsession.dependency 'OHHTTPStubs/Core'
-    urlsession.source_files = "Sources/OHHTTPStubsCore/**/NSURLRequest+HTTPBodyTesting.{h,m}", "Sources/OHHTTPStubsCore/**/OHHTTPStubs+NSURLSessionConfiguration.{h,m}", "Sources/OHHTTPStubsCore/**/OHHTTPStubsMethodSwizzling.{h,m}"
-    urlsession.private_header_files = "Sources/OHHTTPStubsCore/**/OHHTTPStubsMethodSwizzling.h"
+    urlsession.source_files = "Sources/OHHTTPStubs/**/NSURLRequest+HTTPBodyTesting.{h,m}", "Sources/OHHTTPStubs/**/OHHTTPStubs+NSURLSessionConfiguration.{h,m}", "Sources/OHHTTPStubs/**/OHHTTPStubsMethodSwizzling.{h,m}"
+    urlsession.private_header_files = "Sources/OHHTTPStubs/**/OHHTTPStubsMethodSwizzling.h"
   end
 
   s.subspec 'JSON' do |json|
     json.dependency 'OHHTTPStubs/Core'
-    json.source_files = "Sources/OHHTTPStubsCore/**/OHHTTPStubsResponse+JSON.{h,m}"
+    json.source_files = "Sources/OHHTTPStubs/**/OHHTTPStubsResponse+JSON.{h,m}"
   end
 
   s.subspec 'HTTPMessage' do |httpmessage|
@@ -72,7 +72,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'OHPathHelpers' do |pathhelper|
-    pathhelper.source_files = "Sources/OHHTTPStubsCore/**/OHPathHelpers.{h,m}", "Sources/OHHTTPStubsCore/include/Compatibility.h"
+    pathhelper.source_files = "Sources/OHHTTPStubs/**/OHPathHelpers.{h,m}", "Sources/OHHTTPStubs/include/Compatibility.h"
   end
 
   s.subspec 'Swift' do |swift|

OHHTTPStubs.xcodeproj/project.pbxproj

@@ -421,7 +421,7 @@
 			path = Tests/OHHTTPStubsSwiftTests;
 			sourceTree = SOURCE_ROOT;
 		};
-		1FB9EFE722FFBE670027737A /* OHHTTPStubsCore */ = {
+		1FB9EFE722FFBE670027737A /* OHHTTPStubs */ = {
 			isa = PBXGroup;
 			children = (
 				1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */,
@@ -434,8 +434,8 @@
 				1FB9EFF522FFBE670027737A /* OHHTTPStubsMethodSwizzling.h */,
 				1FB9EFF622FFBE670027737A /* OHHTTPStubsResponse.m */,
 			);
-			name = OHHTTPStubsCore;
-			path = Sources/OHHTTPStubsCore;
+			name = OHHTTPStubs;
+			path = Sources/OHHTTPStubs;
 			sourceTree = SOURCE_ROOT;
 		};
 		1FB9EFEC22FFBE670027737A /* include */ = {
@@ -451,7 +451,7 @@
 			path = include;
 			sourceTree = "<group>";
 		};
-		1FB9F02922FFC0CF0027737A /* OHHTTPStubsCoreTests */ = {
+		1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */ = {
 			isa = PBXGroup;
 			children = (
 				1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */,
@@ -463,15 +463,15 @@
 				1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */,
 				1FB9F03122FFC0CF0027737A /* NilValuesTests.m */,
 			);
-			path = OHHTTPStubsCoreTests;
+			path = OHHTTPStubsTests;
 			sourceTree = "<group>";
 		};
 		1FCC5C6A22FD95C200472F5B /* Sources */ = {
 			isa = PBXGroup;
 			children = (
 				1FCC5C7222FD95C200472F5B /* HTTPMessage */,
 				1FCC5C7622FD95C200472F5B /* Mocktail */,
-				1FB9EFE722FFBE670027737A /* OHHTTPStubsCore */,
+				1FB9EFE722FFBE670027737A /* OHHTTPStubs */,
 				1FCC5C8222FD95C200472F5B /* OHHTTPStubsSwift */,
 				1FCC5CCE22FD95CC00472F5B /* Supporting Files */,
 			);
@@ -535,7 +535,7 @@
 			children = (
 				1FCC5CE222FD95D700472F5B /* Fixtures */,
 				1FCC5CED22FD95D700472F5B /* MocktailTests */,
-				1FB9F02922FFC0CF0027737A /* OHHTTPStubsCoreTests */,
+				1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */,
 				1F51F12222FE4C53003463C1 /* OHHTTPStubsSwiftTests */,
 				1F462BBD22FD9765000B7253 /* Supporting Files */,
 			);
@@ -1212,6 +1212,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -1266,6 +1267,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1506,7 +1508,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = OHHTTPStubs;
 				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1527,7 +1528,6 @@
 				PRODUCT_NAME = OHHTTPStubs;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -1547,6 +1547,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
 		};
@@ -1567,6 +1568,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
 		};
@@ -1587,6 +1589,7 @@
 				PRODUCT_NAME = OHHTTPStubs;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
 		};
@@ -1608,6 +1611,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
 		};

Package.swift

@@ -7,13 +7,13 @@ let package = Package(
         .library(
             name: "OHHTTPStubs",
             targets: [
-                "OHHTTPStubsCore",
+                "OHHTTPStubs",
             ]
         ),
         .library(
             name: "OHHTTPStubsSwift",
             targets: [
-                "OHHTTPStubsCore",
+                "OHHTTPStubs",
                 "OHHTTPStubsSwift"
             ]
         )
@@ -22,17 +22,17 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "OHHTTPStubsCore",
+            name: "OHHTTPStubs",
             dependencies: []),
         .testTarget(
-            name: "OHHTTPStubsCoreTests",
-            dependencies: ["OHHTTPStubsCore"]),
+            name: "OHHTTPStubsTests",
+            dependencies: ["OHHTTPStubs"]),
         .target(
             name: "OHHTTPStubsSwift",
-            dependencies: ["OHHTTPStubsCore"]),
+            dependencies: ["OHHTTPStubs"]),
         .testTarget(
             name: "OHHTTPStubsSwiftTests",
-            dependencies: ["OHHTTPStubsSwift", "OHHTTPStubsCore"]
+            dependencies: ["OHHTTPStubsSwift", "OHHTTPStubs"]
         )
     ]
 )

Pods/AFNetworking/UIKit+AFNetworking/AFImageDownloader.m

@@ -123,9 +123,9 @@ Here's a list of which subspecs are included for each of the different lines you
 
 ## Swift Package Manager
 
-`OHHTTPStubs` is compatible with Swift Package Manager, and provides 2 targets for consumption: `OHHTTPStubsCore` and `OHHTTPStubsSwift`.
+`OHHTTPStubs` is compatible with Swift Package Manager, and provides 2 targets for consumption: `OHHTTPStubs` and `OHHTTPStubsSwift`.
 
-* `OHHTTPStubsCore` is equivalent to the `OHHTTPStubs` subspec.
+* `OHHTTPStubs` is equivalent to the `OHHTTPStubs` subspec.
 * `OHHTTPStubsSwift` is equivalent to the `OHHTTPStubs/Swift` subspec.
 
 _Note: We currently do not have support for the HTTPMessage or Mocktail subspecs in Swift Package Manager.  If you are interested in these, please open an issue to explain your needs._