Skip to content

Commit

Permalink
Remove SwiftGenPlugin and add SwiftGen as a CocoaPod
Browse files Browse the repository at this point in the history
Temporary workaround because of a bug in SwiftGenPlugin with XCode 14. SwiftGen/SwiftGenPlugin#2
  • Loading branch information
wsarles committed Oct 13, 2022
1 parent c6b9f7b commit 32efd74
Show file tree
Hide file tree
Showing 49 changed files with 7,883 additions and 919 deletions.
47 changes: 20 additions & 27 deletions Planetary.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3337,6 +3337,7 @@
buildConfigurationList = 5344D83D21C4649A00704A34 /* Build configuration list for PBXNativeTarget "Planetary" */;
buildPhases = (
D4A56648BF87798DA8D53240 /* [CP] Check Pods Manifest.lock */,
E08B98F028F85984003E4B83 /* Run SwiftGen */,
5B6C333B2832D4FE001F10D6 /* Run swiftlint on modified files */,
8D9143FB230C6B670075BC8A /* Generate Localized Strings */,
5B0D584E27BAAE69002F927D /* Make Acknowledgments.plist */,
Expand All @@ -3350,7 +3351,6 @@
buildRules = (
);
dependencies = (
C9BF622B28F5AB9E00FD69A3 /* PBXTargetDependency */,
);
name = Planetary;
packageProductDependencies = (
Expand Down Expand Up @@ -3472,7 +3472,6 @@
C969F434282C79CC00FF6FE3 /* XCRemoteSwiftPackageReference "lottie-ios" */,
5BC2974428048AD800C0CD81 /* XCRemoteSwiftPackageReference "SQLite" */,
5B5BB8DB283E8BFC00D99AB8 /* XCRemoteSwiftPackageReference "SkeletonView" */,
C9BF622F28F5AE1700FD69A3 /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */,
);
productRefGroup = 5344D82C21C4649700704A34 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -3911,6 +3910,25 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
E08B98F028F85984003E4B83 /* Run SwiftGen */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run SwiftGen";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [[ -f \"${PODS_ROOT}/SwiftGen/bin/swiftgen\" ]]; then\n \"${PODS_ROOT}/SwiftGen/bin/swiftgen\"\nelse\n echo \"warning: SwiftGen is not installed. Run 'pod install --repo-update' to install it.\"\nfi\n";
};
F03FDAAC62494C507A69A807 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -4981,10 +4999,6 @@
target = 5344D82A21C4649700704A34 /* Planetary */;
targetProxy = 0AD00E7323FC5C71006BF017 /* PBXContainerItemProxy */;
};
C9BF622B28F5AB9E00FD69A3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = C9BF622A28F5AB9E00FD69A3 /* SwiftGenPlugin */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down Expand Up @@ -5799,22 +5813,6 @@
minimumVersion = 3.0.0;
};
};
C9BF622928F5AB4400FD69A3 /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SwiftGen/SwiftGenPlugin";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.0.0;
};
};
C9BF622F28F5AE1700FD69A3 /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/BookBeat/SwiftGenPlugin";
requirement = {
branch = "xcodeproject-support";
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -5897,11 +5895,6 @@
package = C969F434282C79CC00FF6FE3 /* XCRemoteSwiftPackageReference "lottie-ios" */;
productName = Lottie;
};
C9BF622A28F5AB9E00FD69A3 /* SwiftGenPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = C9BF622928F5AB4400FD69A3 /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */;
productName = "plugin:SwiftGenPlugin";
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 5344D82321C4649700704A34 /* Project object */;
Expand Down
9 changes: 0 additions & 9 deletions Planetary.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,6 @@
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
"version": "1.4.2"
}
},
{
"package": "SwiftGenPlugin",
"repositoryURL": "https://github.com/BookBeat/SwiftGenPlugin",
"state": {
"branch": "xcodeproject-support",
"revision": "1228d5a43ca791db0719d42f641c34a00b9c32f3",
"version": null
}
}
]
},
Expand Down
1 change: 1 addition & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ target 'Planetary' do
pod 'PhoneNumberKit', '3.2.0'
pod 'SVProgressHUD', '2.2.5'
pod 'Down', '0.9.2'
pod 'SwiftGen', '6.6.2'
end

target 'APITests' do
Expand Down
6 changes: 5 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ PODS:
- PhoneNumberKit/UIKit (3.2.0):
- PhoneNumberKit/PhoneNumberKitCore
- SVProgressHUD (2.2.5)
- SwiftGen (6.6.2)

DEPENDENCIES:
- Down (= 0.9.2)
Expand All @@ -20,6 +21,7 @@ DEPENDENCIES:
- Multipart (= 0.1.0)
- PhoneNumberKit (= 3.2.0)
- SVProgressHUD (= 2.2.5)
- SwiftGen (= 6.6.2)

SPEC REPOS:
trunk:
Expand All @@ -29,6 +31,7 @@ SPEC REPOS:
- Multipart
- PhoneNumberKit
- SVProgressHUD
- SwiftGen

SPEC CHECKSUMS:
Down: 1f6a14846dff45ae8e7e4334b4e386a5fd3b2412
Expand All @@ -37,7 +40,8 @@ SPEC CHECKSUMS:
Multipart: b480ccb6d74264ea69e7f37133c70597cc0ca87e
PhoneNumberKit: df411d46177d1492da84e10b6c093846dd861452
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c

PODFILE CHECKSUM: 3a3b8965439f97056d40f746cb553ee8e400e141
PODFILE CHECKSUM: 57b3f6191bdcc255bf30d7c969980713ece21f95

COCOAPODS: 1.11.3
6 changes: 5 additions & 1 deletion Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 32efd74

Please sign in to comment.