Remove inflection option, pluralizer and dependency

apollographql · Jul 16, 2021 · 42a75f2 · 42a75f2
1 parent ccca7e7
commit 42a75f2
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 232 deletions.
diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj
@@ -34,9 +34,6 @@
 		9B455CE62492D0A3002255A9 /* OptionalBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B455CE32492D0A3002255A9 /* OptionalBoolean.swift */; };
 		9B455CE72492D0A3002255A9 /* Collection+Apollo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B455CE42492D0A3002255A9 /* Collection+Apollo.swift */; };
 		9B455CEB2492FB03002255A9 /* String+SHA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B455CEA2492FB03002255A9 /* String+SHA.swift */; };
-		9B47515D2575AA4A0001FB87 /* InflectorKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9B47515C2575AA4A0001FB87 /* InflectorKit */; };
-		9B47518D2575AA850001FB87 /* Pluralizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B47516D2575AA690001FB87 /* Pluralizer.swift */; };
-		9B4751AD2575B5070001FB87 /* PluralizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B4751AC2575B5070001FB87 /* PluralizerTests.swift */; };
 		9B4F453F244A27B900C2CF7D /* URLSessionClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B4F453E244A27B900C2CF7D /* URLSessionClient.swift */; };
 		9B518C87235F819E004C426D /* CLIDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B518C85235F8125004C426D /* CLIDownloader.swift */; };
 		9B518C8C235F8B5F004C426D /* ApolloFilePathHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B518C8A235F8B05004C426D /* ApolloFilePathHelper.swift */; };
@@ -558,8 +555,6 @@
 		9B455CE32492D0A3002255A9 /* OptionalBoolean.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptionalBoolean.swift; sourceTree = "<group>"; };
 		9B455CE42492D0A3002255A9 /* Collection+Apollo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Collection+Apollo.swift"; sourceTree = "<group>"; };
 		9B455CEA2492FB03002255A9 /* String+SHA.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+SHA.swift"; sourceTree = "<group>"; };
-		9B47516D2575AA690001FB87 /* Pluralizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pluralizer.swift; sourceTree = "<group>"; };
-		9B4751AC2575B5070001FB87 /* PluralizerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluralizerTests.swift; sourceTree = "<group>"; };
 		9B4AA8AD239EFDC9003E1300 /* Apollo-Target-CodegenTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-CodegenTests.xcconfig"; sourceTree = "<group>"; };
 		9B4F453E244A27B900C2CF7D /* URLSessionClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionClient.swift; sourceTree = "<group>"; };
 		9B4F4540244A2A9200C2CF7D /* HTTPBinAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPBinAPI.swift; sourceTree = "<group>"; };
@@ -835,7 +830,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DECD47C3262F779800924527 /* ApolloUtils.framework in Frameworks */,
-				9B47515D2575AA4A0001FB87 /* InflectorKit in Frameworks */,
 				9B68F04D2413239100E97318 /* Stencil in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1152,14 +1146,6 @@
 			name = Extensions;
 			sourceTree = "<group>";
 		};
-		9B4751BD2575BAFB0001FB87 /* Naming */ = {
-			isa = PBXGroup;
-			children = (
-				9B47516D2575AA690001FB87 /* Pluralizer.swift */,
-			);
-			name = Naming;
-			sourceTree = "<group>";
-		};
 		9B6835472463486200337AE6 /* ApolloUtils */ = {
 			isa = PBXGroup;
 			children = (
@@ -1174,7 +1160,6 @@
 			isa = PBXGroup;
 			children = (
 				9FE1E54C2588C5E000AA967E /* Frontend */,
-				9B4751BD2575BAFB0001FB87 /* Naming */,
 				9BCB585D240758B2002F766E /* Extensions */,
 				9BD681332405F6BB000874CB /* Codegen */,
 				9BD681322405F69C000874CB /* CLI */,
@@ -1244,7 +1229,6 @@
 				9B68F03A240D8D1800E97318 /* CodegenExtensionTests.swift */,
 				9BAEEC0D234BB95B00808306 /* FileManagerExtensionsTests.swift */,
 				9B68F0542416B33300E97318 /* LineByLineComparison.swift */,
-				9B4751AC2575B5070001FB87 /* PluralizerTests.swift */,
 				9B8C3FB4248DA3E000707B13 /* URLExtensionsTests.swift */,
 				9BAEEC0C234BB95B00808306 /* Info.plist */,
 			);
@@ -1890,13 +1874,11 @@
 			);
 			dependencies = (
 				DECD4873262F7A7100924527 /* PBXTargetDependency */,
-				DECD4871262F7A6E00924527 /* PBXTargetDependency */,
 				9B683549246348CB00337AE6 /* PBXTargetDependency */,
 			);
 			name = ApolloCodegenLib;
 			packageProductDependencies = (
 				9B68F04C2413239100E97318 /* Stencil */,
-				9B47515C2575AA4A0001FB87 /* InflectorKit */,
 			);
 			productName = ApolloCodegenLib;
 			productReference = 9B7B6F47233C26D100F32205 /* ApolloCodegenLib.framework */;
@@ -2238,7 +2220,6 @@
 			packageReferences = (
 				9B7BDAF423FDEE2600ACD198 /* XCRemoteSwiftPackageReference "SQLite.swift" */,
 				9B68F04B2413239100E97318 /* XCRemoteSwiftPackageReference "Stencil" */,
-				9B47515B2575AA4A0001FB87 /* XCRemoteSwiftPackageReference "InflectorKit" */,
 				DE8C84F2268BBF8000C54D02 /* XCRemoteSwiftPackageReference "Starscream" */,
 			);
 			productRefGroup = 9FC750451D2A532C00458D91 /* Products */;
@@ -2457,7 +2438,6 @@
 				9B0E471C240B167C0093BDA7 /* String+Apollo.swift in Sources */,
 				9BAEEBF32346DDAD00808306 /* CodegenLogger.swift in Sources */,
 				9F628EB52593651B00F94F9D /* GraphQLValue.swift in Sources */,
-				9B47518D2575AA850001FB87 /* Pluralizer.swift in Sources */,
 				9B518C8C235F8B5F004C426D /* ApolloFilePathHelper.swift in Sources */,
 				9F628E9525935BE600F94F9D /* GraphQLType.swift in Sources */,
 				9B518C87235F819E004C426D /* CLIDownloader.swift in Sources */,
@@ -2516,7 +2496,6 @@
 				9F62DF8E2590539A00E6E808 /* SchemaIntrospectionTests.swift in Sources */,
 				9B68F0552416B33300E97318 /* LineByLineComparison.swift in Sources */,
 				9BAEEC15234C132600808306 /* CLIExtractorTests.swift in Sources */,
-				9B4751AD2575B5070001FB87 /* PluralizerTests.swift in Sources */,
 				9BAEEC19234C297800808306 /* ApolloCodegenTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2841,10 +2820,6 @@
 			target = 9B2DFBB524E1FA0D00ED3AE6 /* UploadAPI */;
 			targetProxy = DECD4734262F668200924527 /* PBXContainerItemProxy */;
 		};
-		DECD4871262F7A6E00924527 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = DECD4870262F7A6E00924527 /* InflectorKit */;
-		};
 		DECD4873262F7A7100924527 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			productRef = DECD4872262F7A7100924527 /* Stencil */;
@@ -3408,14 +3383,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		9B47515B2575AA4A0001FB87 /* XCRemoteSwiftPackageReference "InflectorKit" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apollographql/InflectorKit.git";
-			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 0.0.2;
-			};
-		};
 		9B68F04B2413239100E97318 /* XCRemoteSwiftPackageReference "Stencil" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/stencilproject/Stencil.git";
@@ -3451,11 +3418,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		9B47515C2575AA4A0001FB87 /* InflectorKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9B47515B2575AA4A0001FB87 /* XCRemoteSwiftPackageReference "InflectorKit" */;
-			productName = InflectorKit;
-		};
 		9B68F04C2413239100E97318 /* Stencil */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9B68F04B2413239100E97318 /* XCRemoteSwiftPackageReference "Stencil" */;
@@ -3486,11 +3448,6 @@
 			package = DE8C84F2268BBF8000C54D02 /* XCRemoteSwiftPackageReference "Starscream" */;
 			productName = Starscream;
 		};
-		DECD4870262F7A6E00924527 /* InflectorKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9B47515B2575AA4A0001FB87 /* XCRemoteSwiftPackageReference "InflectorKit" */;
-			productName = InflectorKit;
-		};
 		DECD4872262F7A7100924527 /* Stencil */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9B68F04B2413239100E97318 /* XCRemoteSwiftPackageReference "Stencil" */;

diff --git a/Apollo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apollo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "InflectorKit",
-        "repositoryURL": "https://github.com/apollographql/InflectorKit.git",
-        "state": {
-          "branch": null,
-          "revision": "b1d0099abe36facd198113633f502889842906af",
-          "version": "0.0.2"
-        }
-      },
       {
         "package": "PathKit",
         "repositoryURL": "https://github.com/kylef/PathKit.git",

diff --git a/Package.resolved b/Package.resolved
@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "InflectorKit",
-        "repositoryURL": "https://github.com/apollographql/InflectorKit",
-        "state": {
-          "branch": null,
-          "revision": "b1d0099abe36facd198113633f502889842906af",
-          "version": "0.0.2"
-        }
-      },
       {
         "package": "PathKit",
         "repositoryURL": "https://github.com/kylef/PathKit.git",

diff --git a/Package.swift b/Package.swift
@@ -45,9 +45,6 @@ let package = Package(
     .package(
       url: "https://github.com/stencilproject/Stencil.git",
       .upToNextMinor(from: "0.14.0")),
-    .package(
-      url: "https://github.com/apollographql/InflectorKit",
-      .upToNextMinor(from: "0.0.2")),
   ],
   targets: [
     .target(
@@ -76,7 +73,6 @@ let package = Package(
       name: "ApolloCodegenLib",
       dependencies: [
         "ApolloUtils",
-        .product(name: "InflectorKit", package: "InflectorKit"),
         .product(name: "Stencil", package: "Stencil"),
       ],
       exclude: [

diff --git a/Package@swift-5.2.swift b/Package@swift-5.2.swift
@@ -36,9 +36,6 @@ let package = Package(
     .package(
       url: "https://github.com/stencilproject/Stencil.git",
       .upToNextMinor(from: "0.14.0")),
-    .package(
-      url: "https://github.com/apollographql/InflectorKit",
-      .upToNextMinor(from: "0.0.2")),
     ],
     targets: [
       .target(
@@ -53,7 +50,6 @@ let package = Package(
       name: "ApolloCodegenLib",
       dependencies: [
         "ApolloCore",
-        "InflectorKit",
         .product(name: "Stencil", package: "Stencil"),
       ]),
     .target(

diff --git a/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift b/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift
@@ -58,7 +58,6 @@ public struct ApolloCodegenOptions {
   }
 
   let codegenEngine: CodeGenerationEngine
-  let additionalInflectionRules: [InflectionRule]
   let includes: String
   let mergeInFieldsFromFragmentSpreads: Bool
   let namespace: String?
@@ -89,9 +88,7 @@ public struct ApolloCodegenOptions {
   ///  - suppressSwiftMultilineStringLiterals: Don't use multi-line string literals when generating code. Defaults to false.
   ///  - urlToSchemaFile: The URL to your schema file.
   ///  - downloadTimeout: The maximum time to wait before indicating that the download timed out, in seconds. Defaults to 30 seconds.
-  ///  - additionalInflectionRules: [EXPERIMENTAL SWIFT CODEGEN ONLY] - Any non-default rules for pluralization or singularization you wish to include. Defaults to an empty array.
   public init(codegenEngine: CodeGenerationEngine = .default,
-              additionalInflectionRules: [InflectionRule] = [],
               includes: String = "./**/*.graphql",
               mergeInFieldsFromFragmentSpreads: Bool = true,
               modifier: AccessModifier = .public,
@@ -105,7 +102,6 @@ public struct ApolloCodegenOptions {
               urlToSchemaFile: URL,
               downloadTimeout: Double = 30.0) {
     self.codegenEngine = codegenEngine
-    self.additionalInflectionRules = additionalInflectionRules
     self.includes = includes
     self.mergeInFieldsFromFragmentSpreads = mergeInFieldsFromFragmentSpreads
     self.modifier = modifier

diff --git a/Sources/ApolloCodegenLib/Pluralizer.swift b/Sources/ApolloCodegenLib/Pluralizer.swift
diff --git a/SwiftScripts/Package.resolved b/SwiftScripts/Package.resolved
@@ -10,15 +10,6 @@
           "version": "0.17.0"
         }
       },
-      {
-        "package": "InflectorKit",
-        "repositoryURL": "https://github.com/apollographql/InflectorKit",
-        "state": {
-          "branch": null,
-          "revision": "b1d0099abe36facd198113633f502889842906af",
-          "version": "0.0.2"
-        }
-      },
       {
         "package": "MarkdownGenerator",
         "repositoryURL": "https://github.com/eneko/MarkdownGenerator.git",