From d3f277e923b5e5e96df4b3c17986347eafc709b3 Mon Sep 17 00:00:00 2001 From: Ryan Baumbach Date: Mon, 17 Oct 2022 16:53:13 -0600 Subject: [PATCH 1/5] 1) Update Info.plist version to 1.1.0 2) Remove IntegrationSpecs target and combine with Specs target 3) Rename Specs target to Tests target to make it more compatible with SPM 4) Rename Source -> Sources and create Include directory to make file structure SPM compatible 5) Remove all but Swizzlean scheme 6) Remove integration specs from specs fastlane lane 7) Create Package.swift 8) Update Podfile since a target was removed that was being referenced --- .gitignore | 14 +- Package.swift | 20 ++ Podfile | 6 - Podfile.lock | 2 +- .../Swizzlean}/RuntimeUtils.h | 0 .../Swizzlean}/RuntimeUtils.m | 0 .../Swizzlean}/Supporting Files/Info.plist | 2 +- .../Source => Sources/Swizzlean}/Swizzlean.m | 0 .../Swizzlean/include}/Swizzlean.h | 0 Specs/Supporting Files/Info.plist | 22 -- Swizzlean.xcodeproj/project.pbxproj | 258 ++++-------------- .../Swizzlean IntegrationSpecs.xcscheme | 97 ------- {Specs => Tests}/Fakes/FakeRuntimeUtils.h | 0 {Specs => Tests}/Fakes/FakeRuntimeUtils.m | 0 .../Fakes/IntegrationTestClass.h | 0 .../Fakes/IntegrationTestClass.m | 0 {Specs => Tests}/Fakes/TestClass.h | 0 {Specs => Tests}/Fakes/TestClass.m | 0 .../Supporting Files/Info.plist | 0 .../SwizzleanIntegrationSpec.m | 0 .../SwizzleanTests}/RuntimeUtilsSpec.m | 0 .../SwizzleanTests}/SwizzleanSpec.m | 0 fastlane/Fastfile | 5 - 23 files changed, 86 insertions(+), 340 deletions(-) create mode 100644 Package.swift rename {Swizzlean/Source => Sources/Swizzlean}/RuntimeUtils.h (100%) rename {Swizzlean/Source => Sources/Swizzlean}/RuntimeUtils.m (100%) rename {Swizzlean => Sources/Swizzlean}/Supporting Files/Info.plist (96%) rename {Swizzlean/Source => Sources/Swizzlean}/Swizzlean.m (100%) rename {Swizzlean/Source => Sources/Swizzlean/include}/Swizzlean.h (100%) delete mode 100644 Specs/Supporting Files/Info.plist delete mode 100644 Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean IntegrationSpecs.xcscheme rename {Specs => Tests}/Fakes/FakeRuntimeUtils.h (100%) rename {Specs => Tests}/Fakes/FakeRuntimeUtils.m (100%) rename {IntegrationSpecs => Tests}/Fakes/IntegrationTestClass.h (100%) rename {IntegrationSpecs => Tests}/Fakes/IntegrationTestClass.m (100%) rename {Specs => Tests}/Fakes/TestClass.h (100%) rename {Specs => Tests}/Fakes/TestClass.m (100%) rename {IntegrationSpecs => Tests}/Supporting Files/Info.plist (100%) rename {IntegrationSpecs/Swizzlean => Tests/SwizzleanIntegrationTests}/SwizzleanIntegrationSpec.m (100%) rename {Specs/Swizzlean => Tests/SwizzleanTests}/RuntimeUtilsSpec.m (100%) rename {Specs/Swizzlean => Tests/SwizzleanTests}/SwizzleanSpec.m (100%) diff --git a/.gitignore b/.gitignore index a40c568..bc999b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ -# Xcode +# macOS + .DS_Store + +# Xcode + build/ +.build/ *.pbxuser !default.pbxuser *.mode1v3 @@ -14,18 +19,23 @@ xcuserdata profile *.moved-aside DerivedData -.idea/ Pods/ ObjectiveC.gcda ObjectiveC.gcno # Carthage + Carthage Swizzlean.framework.zip # Fastlane + fastlane/report.xml fastlane/.env*private* fastlane/test-output/ fastlane/test_output/ fastlane/README.md + +# Jetbrains + +.idea/ \ No newline at end of file diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..025f3bb --- /dev/null +++ b/Package.swift @@ -0,0 +1,20 @@ +// swift-tools-version: 5.7 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Swizzlean", + products: [ + .library( + name: "Swizzlean", + targets: ["Swizzlean"]) + ], + targets: [ + .target( + name: "Swizzlean"), + .testTarget( + name: "SwizzleanTests", + dependencies: ["Swizzlean"]) + ] +) diff --git a/Podfile b/Podfile index ff612d0..bcf8132 100644 --- a/Podfile +++ b/Podfile @@ -8,9 +8,3 @@ target :Specs do pod 'Expecta' pod 'OCMock' end - -target :IntegrationSpecs do - pod 'Specta' - pod 'Expecta' - pod 'OCMock' -end diff --git a/Podfile.lock b/Podfile.lock index 4e2d94e..22361a9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -19,6 +19,6 @@ SPEC CHECKSUMS: OCMock: 75fbeaa46a9b11f8c182bbb1d1f7e9a35ccc9955 Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 -PODFILE CHECKSUM: c43dc820eeb25e43398aae8a31f14fe4e7b13e6f +PODFILE CHECKSUM: 22bd42077b7bc18750c04e52fdf5fbba17b734b9 COCOAPODS: 1.11.3 diff --git a/Swizzlean/Source/RuntimeUtils.h b/Sources/Swizzlean/RuntimeUtils.h similarity index 100% rename from Swizzlean/Source/RuntimeUtils.h rename to Sources/Swizzlean/RuntimeUtils.h diff --git a/Swizzlean/Source/RuntimeUtils.m b/Sources/Swizzlean/RuntimeUtils.m similarity index 100% rename from Swizzlean/Source/RuntimeUtils.m rename to Sources/Swizzlean/RuntimeUtils.m diff --git a/Swizzlean/Supporting Files/Info.plist b/Sources/Swizzlean/Supporting Files/Info.plist similarity index 96% rename from Swizzlean/Supporting Files/Info.plist rename to Sources/Swizzlean/Supporting Files/Info.plist index c3bbb00..9c590b8 100644 --- a/Swizzlean/Supporting Files/Info.plist +++ b/Sources/Swizzlean/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.3 + 1.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Swizzlean/Source/Swizzlean.m b/Sources/Swizzlean/Swizzlean.m similarity index 100% rename from Swizzlean/Source/Swizzlean.m rename to Sources/Swizzlean/Swizzlean.m diff --git a/Swizzlean/Source/Swizzlean.h b/Sources/Swizzlean/include/Swizzlean.h similarity index 100% rename from Swizzlean/Source/Swizzlean.h rename to Sources/Swizzlean/include/Swizzlean.h diff --git a/Specs/Supporting Files/Info.plist b/Specs/Supporting Files/Info.plist deleted file mode 100644 index 6c6c23c..0000000 --- a/Specs/Supporting Files/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/Swizzlean.xcodeproj/project.pbxproj b/Swizzlean.xcodeproj/project.pbxproj index 42446ef..84513b3 100644 --- a/Swizzlean.xcodeproj/project.pbxproj +++ b/Swizzlean.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 9409BCD328FDEFAF002B5761 /* IntegrationTestClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */; }; + 9409BCD428FDF0A1002B5761 /* SwizzleanIntegrationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */; }; 944C7B531EA260D2003A06C4 /* RuntimeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 944C7B4F1EA260D2003A06C4 /* RuntimeUtils.h */; settings = {ATTRIBUTES = (Private, ); }; }; 944C7B541EA260D2003A06C4 /* RuntimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B501EA260D2003A06C4 /* RuntimeUtils.m */; }; 944C7B551EA260D2003A06C4 /* Swizzlean.h in Headers */ = {isa = PBXBuildFile; fileRef = 944C7B511EA260D2003A06C4 /* Swizzlean.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -16,11 +18,7 @@ 944C7B6F1EA26270003A06C4 /* RuntimeUtilsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B6D1EA26270003A06C4 /* RuntimeUtilsSpec.m */; }; 944C7B701EA26270003A06C4 /* SwizzleanSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */; }; 944C7B731EA26277003A06C4 /* TestClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B721EA26277003A06C4 /* TestClass.m */; }; - 944C7B7E1EA2643A003A06C4 /* Swizzlean.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */; }; - 944C7B881EA2648A003A06C4 /* IntegrationTestClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */; }; - 944C7B8A1EA26492003A06C4 /* SwizzleanIntegrationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */; }; 970477ACA2B27A3B23D3C1E9 /* libPods-Specs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A6D53B330DF5942EDE5D70 /* libPods-Specs.a */; }; - C254371D29C85DE126318566 /* libPods-IntegrationSpecs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49F0A343DC95C9BB40D5243E /* libPods-IntegrationSpecs.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,19 +29,13 @@ remoteGlobalIDString = 944C7B451EA25FB5003A06C4; remoteInfo = Swizzlean; }; - 944C7B7F1EA2643A003A06C4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = AF32F069174671D400EC79F7 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 944C7B451EA25FB5003A06C4; - remoteInfo = Swizzlean; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 087B7D7E1C2B7E5D299D0016 /* Pods-IntegrationSpecs.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntegrationSpecs.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IntegrationSpecs/Pods-IntegrationSpecs.debug.xcconfig"; sourceTree = ""; }; 49F0A343DC95C9BB40D5243E /* libPods-IntegrationSpecs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IntegrationSpecs.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 72A6D53B330DF5942EDE5D70 /* libPods-Specs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Specs.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9409BCD528FDF1F8002B5761 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Swizzlean.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 944C7B491EA25FB5003A06C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 944C7B4F1EA260D2003A06C4 /* RuntimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeUtils.h; sourceTree = ""; }; @@ -58,8 +50,6 @@ 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwizzleanSpec.m; sourceTree = ""; }; 944C7B711EA26277003A06C4 /* TestClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestClass.h; sourceTree = ""; }; 944C7B721EA26277003A06C4 /* TestClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestClass.m; sourceTree = ""; }; - 944C7B791EA2643A003A06C4 /* IntegrationSpecs.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IntegrationSpecs.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 944C7B7D1EA2643A003A06C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 944C7B861EA2648A003A06C4 /* IntegrationTestClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegrationTestClass.h; sourceTree = ""; }; 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntegrationTestClass.m; sourceTree = ""; }; 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwizzleanIntegrationSpec.m; sourceTree = ""; }; @@ -85,15 +75,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 944C7B761EA2643A003A06C4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 944C7B7E1EA2643A003A06C4 /* Swizzlean.framework in Frameworks */, - C254371D29C85DE126318566 /* libPods-IntegrationSpecs.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -108,86 +89,81 @@ name = Pods; sourceTree = ""; }; - 944C7B471EA25FB5003A06C4 /* Swizzlean */ = { - isa = PBXGroup; - children = ( - 946059E522DA1EEA00936CCF /* Source */, - 946059E422DA1EBB00936CCF /* Supporting Files */, - ); - path = Swizzlean; - sourceTree = ""; - }; - 944C7B5E1EA261E5003A06C4 /* Specs */ = { + 9409BCD028FDE934002B5761 /* Sources */ = { isa = PBXGroup; children = ( - 946059E022DA18F100936CCF /* Swizzlean */, - 946059DE22DA18B500936CCF /* Fakes */, - 946059DF22DA18D800936CCF /* Supporting Files */, + 944C7B471EA25FB5003A06C4 /* Swizzlean */, ); - path = Specs; + path = Sources; sourceTree = ""; }; - 944C7B7A1EA2643A003A06C4 /* IntegrationSpecs */ = { + 9409BCD128FDED63002B5761 /* include */ = { isa = PBXGroup; children = ( - 946059E222DA1E4000936CCF /* Swizzlean */, - 946059E122DA1E3600936CCF /* Fakes */, - 946059E322DA1E5400936CCF /* Supporting Files */, + 944C7B511EA260D2003A06C4 /* Swizzlean.h */, ); - path = IntegrationSpecs; + path = include; sourceTree = ""; }; - 946059DE22DA18B500936CCF /* Fakes */ = { + 9409BCD228FDEF9E002B5761 /* SwizzleanIntegrationTests */ = { isa = PBXGroup; children = ( - 944C7B711EA26277003A06C4 /* TestClass.h */, - 944C7B721EA26277003A06C4 /* TestClass.m */, - 944C7B6A1EA26251003A06C4 /* FakeRuntimeUtils.h */, - 944C7B6B1EA26251003A06C4 /* FakeRuntimeUtils.m */, + 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */, ); - path = Fakes; + path = SwizzleanIntegrationTests; sourceTree = ""; }; - 946059DF22DA18D800936CCF /* Supporting Files */ = { + 944C7B471EA25FB5003A06C4 /* Swizzlean */ = { isa = PBXGroup; children = ( - 944C7B611EA261E5003A06C4 /* Info.plist */, + 9409BCD128FDED63002B5761 /* include */, + 944C7B521EA260D2003A06C4 /* Swizzlean.m */, + 944C7B4F1EA260D2003A06C4 /* RuntimeUtils.h */, + 944C7B501EA260D2003A06C4 /* RuntimeUtils.m */, + 946059E422DA1EBB00936CCF /* Supporting Files */, ); - path = "Supporting Files"; + path = Swizzlean; sourceTree = ""; }; - 946059E022DA18F100936CCF /* Swizzlean */ = { + 944C7B5E1EA261E5003A06C4 /* Tests */ = { isa = PBXGroup; children = ( - 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */, - 944C7B6D1EA26270003A06C4 /* RuntimeUtilsSpec.m */, + 946059E022DA18F100936CCF /* SwizzleanTests */, + 9409BCD228FDEF9E002B5761 /* SwizzleanIntegrationTests */, + 946059DE22DA18B500936CCF /* Fakes */, + 946059DF22DA18D800936CCF /* Supporting Files */, ); - path = Swizzlean; + path = Tests; sourceTree = ""; }; - 946059E122DA1E3600936CCF /* Fakes */ = { + 946059DE22DA18B500936CCF /* Fakes */ = { isa = PBXGroup; children = ( 944C7B861EA2648A003A06C4 /* IntegrationTestClass.h */, 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */, + 944C7B711EA26277003A06C4 /* TestClass.h */, + 944C7B721EA26277003A06C4 /* TestClass.m */, + 944C7B6A1EA26251003A06C4 /* FakeRuntimeUtils.h */, + 944C7B6B1EA26251003A06C4 /* FakeRuntimeUtils.m */, ); path = Fakes; sourceTree = ""; }; - 946059E222DA1E4000936CCF /* Swizzlean */ = { + 946059DF22DA18D800936CCF /* Supporting Files */ = { isa = PBXGroup; children = ( - 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */, + 944C7B611EA261E5003A06C4 /* Info.plist */, ); - path = Swizzlean; + path = "Supporting Files"; sourceTree = ""; }; - 946059E322DA1E5400936CCF /* Supporting Files */ = { + 946059E022DA18F100936CCF /* SwizzleanTests */ = { isa = PBXGroup; children = ( - 944C7B7D1EA2643A003A06C4 /* Info.plist */, + 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */, + 944C7B6D1EA26270003A06C4 /* RuntimeUtilsSpec.m */, ); - path = "Supporting Files"; + path = SwizzleanTests; sourceTree = ""; }; 946059E422DA1EBB00936CCF /* Supporting Files */ = { @@ -198,23 +174,12 @@ path = "Supporting Files"; sourceTree = ""; }; - 946059E522DA1EEA00936CCF /* Source */ = { - isa = PBXGroup; - children = ( - 944C7B511EA260D2003A06C4 /* Swizzlean.h */, - 944C7B521EA260D2003A06C4 /* Swizzlean.m */, - 944C7B4F1EA260D2003A06C4 /* RuntimeUtils.h */, - 944C7B501EA260D2003A06C4 /* RuntimeUtils.m */, - ); - path = Source; - sourceTree = ""; - }; AF32F068174671D400EC79F7 = { isa = PBXGroup; children = ( - 944C7B471EA25FB5003A06C4 /* Swizzlean */, - 944C7B5E1EA261E5003A06C4 /* Specs */, - 944C7B7A1EA2643A003A06C4 /* IntegrationSpecs */, + 9409BCD528FDF1F8002B5761 /* Package.swift */, + 9409BCD028FDE934002B5761 /* Sources */, + 944C7B5E1EA261E5003A06C4 /* Tests */, AF32F073174671D400EC79F7 /* Frameworks */, AF32F072174671D400EC79F7 /* Products */, 856653F7E066C59131F7D3DF /* Pods */, @@ -226,7 +191,6 @@ children = ( 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */, 944C7B5D1EA261E5003A06C4 /* Specs.xctest */, - 944C7B791EA2643A003A06C4 /* IntegrationSpecs.xctest */, ); name = Products; sourceTree = ""; @@ -292,25 +256,6 @@ productReference = 944C7B5D1EA261E5003A06C4 /* Specs.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 944C7B781EA2643A003A06C4 /* IntegrationSpecs */ = { - isa = PBXNativeTarget; - buildConfigurationList = 944C7B811EA2643A003A06C4 /* Build configuration list for PBXNativeTarget "IntegrationSpecs" */; - buildPhases = ( - F5797F3549F768A9497182EA /* [CP] Check Pods Manifest.lock */, - 944C7B751EA2643A003A06C4 /* Sources */, - 944C7B761EA2643A003A06C4 /* Frameworks */, - 944C7B771EA2643A003A06C4 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 944C7B801EA2643A003A06C4 /* PBXTargetDependency */, - ); - name = IntegrationSpecs; - productName = IntegrationSpecs; - productReference = 944C7B791EA2643A003A06C4 /* IntegrationSpecs.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -323,16 +268,13 @@ TargetAttributes = { 944C7B451EA25FB5003A06C4 = { CreatedOnToolsVersion = 8.3.1; + LastSwiftMigration = 1400; ProvisioningStyle = Manual; }; 944C7B5C1EA261E5003A06C4 = { CreatedOnToolsVersion = 8.3.1; ProvisioningStyle = Manual; }; - 944C7B781EA2643A003A06C4 = { - CreatedOnToolsVersion = 8.3.1; - ProvisioningStyle = Manual; - }; }; }; buildConfigurationList = AF32F06C174671D400EC79F7 /* Build configuration list for PBXProject "Swizzlean" */; @@ -350,7 +292,6 @@ targets = ( 944C7B451EA25FB5003A06C4 /* Swizzlean */, 944C7B5C1EA261E5003A06C4 /* Specs */, - 944C7B781EA2643A003A06C4 /* IntegrationSpecs */, ); }; /* End PBXProject section */ @@ -370,13 +311,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 944C7B771EA2643A003A06C4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -398,24 +332,6 @@ 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; }; - F5797F3549F768A9497182EA /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-IntegrationSpecs-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -432,19 +348,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 944C7B731EA26277003A06C4 /* TestClass.m in Sources */, - 944C7B6C1EA26251003A06C4 /* FakeRuntimeUtils.m in Sources */, 944C7B701EA26270003A06C4 /* SwizzleanSpec.m in Sources */, 944C7B6F1EA26270003A06C4 /* RuntimeUtilsSpec.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 944C7B751EA2643A003A06C4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 944C7B881EA2648A003A06C4 /* IntegrationTestClass.m in Sources */, - 944C7B8A1EA26492003A06C4 /* SwizzleanIntegrationSpec.m in Sources */, + 9409BCD428FDF0A1002B5761 /* SwizzleanIntegrationSpec.m in Sources */, + 9409BCD328FDEFAF002B5761 /* IntegrationTestClass.m in Sources */, + 944C7B731EA26277003A06C4 /* TestClass.m in Sources */, + 944C7B6C1EA26251003A06C4 /* FakeRuntimeUtils.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -456,11 +365,6 @@ target = 944C7B451EA25FB5003A06C4 /* Swizzlean */; targetProxy = 944C7B631EA261E5003A06C4 /* PBXContainerItemProxy */; }; - 944C7B801EA2643A003A06C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 944C7B451EA25FB5003A06C4 /* Swizzlean */; - targetProxy = 944C7B7F1EA2643A003A06C4 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -483,7 +387,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Swizzlean/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Sources/Swizzlean/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -492,6 +396,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -519,7 +425,7 @@ ENABLE_NS_ASSERTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Swizzlean/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Sources/Swizzlean/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -528,6 +434,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -549,7 +456,7 @@ DEVELOPMENT_TEAM = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Specs/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; @@ -576,7 +483,7 @@ ENABLE_NS_ASSERTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Specs/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; @@ -586,58 +493,6 @@ }; name = Release; }; - 944C7B821EA2643A003A06C4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 087B7D7E1C2B7E5D299D0016 /* Pods-IntegrationSpecs.debug.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "IntegrationSpecs/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.rkb.IntegrationSpecs; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - }; - name = Debug; - }; - 944C7B831EA2643A003A06C4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = DBCAFF6777107717CD828CD3 /* Pods-IntegrationSpecs.release.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - ENABLE_NS_ASSERTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "IntegrationSpecs/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.rkb.IntegrationSpecs; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - }; - name = Release; - }; AF32F08C174671D400EC79F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -756,15 +611,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 944C7B811EA2643A003A06C4 /* Build configuration list for PBXNativeTarget "IntegrationSpecs" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 944C7B821EA2643A003A06C4 /* Debug */, - 944C7B831EA2643A003A06C4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; AF32F06C174671D400EC79F7 /* Build configuration list for PBXProject "Swizzlean" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean IntegrationSpecs.xcscheme b/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean IntegrationSpecs.xcscheme deleted file mode 100644 index 5f72682..0000000 --- a/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean IntegrationSpecs.xcscheme +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Specs/Fakes/FakeRuntimeUtils.h b/Tests/Fakes/FakeRuntimeUtils.h similarity index 100% rename from Specs/Fakes/FakeRuntimeUtils.h rename to Tests/Fakes/FakeRuntimeUtils.h diff --git a/Specs/Fakes/FakeRuntimeUtils.m b/Tests/Fakes/FakeRuntimeUtils.m similarity index 100% rename from Specs/Fakes/FakeRuntimeUtils.m rename to Tests/Fakes/FakeRuntimeUtils.m diff --git a/IntegrationSpecs/Fakes/IntegrationTestClass.h b/Tests/Fakes/IntegrationTestClass.h similarity index 100% rename from IntegrationSpecs/Fakes/IntegrationTestClass.h rename to Tests/Fakes/IntegrationTestClass.h diff --git a/IntegrationSpecs/Fakes/IntegrationTestClass.m b/Tests/Fakes/IntegrationTestClass.m similarity index 100% rename from IntegrationSpecs/Fakes/IntegrationTestClass.m rename to Tests/Fakes/IntegrationTestClass.m diff --git a/Specs/Fakes/TestClass.h b/Tests/Fakes/TestClass.h similarity index 100% rename from Specs/Fakes/TestClass.h rename to Tests/Fakes/TestClass.h diff --git a/Specs/Fakes/TestClass.m b/Tests/Fakes/TestClass.m similarity index 100% rename from Specs/Fakes/TestClass.m rename to Tests/Fakes/TestClass.m diff --git a/IntegrationSpecs/Supporting Files/Info.plist b/Tests/Supporting Files/Info.plist similarity index 100% rename from IntegrationSpecs/Supporting Files/Info.plist rename to Tests/Supporting Files/Info.plist diff --git a/IntegrationSpecs/Swizzlean/SwizzleanIntegrationSpec.m b/Tests/SwizzleanIntegrationTests/SwizzleanIntegrationSpec.m similarity index 100% rename from IntegrationSpecs/Swizzlean/SwizzleanIntegrationSpec.m rename to Tests/SwizzleanIntegrationTests/SwizzleanIntegrationSpec.m diff --git a/Specs/Swizzlean/RuntimeUtilsSpec.m b/Tests/SwizzleanTests/RuntimeUtilsSpec.m similarity index 100% rename from Specs/Swizzlean/RuntimeUtilsSpec.m rename to Tests/SwizzleanTests/RuntimeUtilsSpec.m diff --git a/Specs/Swizzlean/SwizzleanSpec.m b/Tests/SwizzleanTests/SwizzleanSpec.m similarity index 100% rename from Specs/Swizzlean/SwizzleanSpec.m rename to Tests/SwizzleanTests/SwizzleanSpec.m diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 381c34d..30d089f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,11 +17,6 @@ platform :ios do configuration: "Debug", output_style: "rspec", code_coverage: false) - - scan(scheme: "Swizzlean IntegrationSpecs", - configuration: "Debug", - output_style: "rspec", - code_coverage: false) end after_all do |lane| From a791d48d7175a3600f2d8a8cee5d9e7696e0f2dc Mon Sep 17 00:00:00 2001 From: Ryan Baumbach Date: Mon, 17 Oct 2022 17:02:49 -0600 Subject: [PATCH 2/5] Update README.md to add SPM support info, bump podspec version to 1.1.0 --- README.md | 19 +++++++++++++------ Swizzlean.podspec | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d119542..66730e6 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,22 @@ A quick and "lean" way to swizzle methods for your Objective-C development needs ### Cocoapods -[CocoaPods](http://cocoapods.org) is the recommended way to add Swizzlean to your project. +[CocoaPods](http://cocoapods.org) is the recommended way to add `Swizzlean` to your project. 1. Add Swizzlean to your Podfile `pod 'Swizzlean'`. 2. Install the pod(s) by running `pod install`. 3. Add Swizzlean to your files with `#import `. +### Swift Package Manager (SPM) + +[Swift Package Manager](https://swift.org/package-manager/) can be used to add `Swizzlean` the to your project: + +1. Add `.package(url: "https://github.com/rbaumbach/Swizzlean", from: "1.1.0")` +2. [Follow intructions to add](https://swift.org/getting-started/#using-the-package-manager) the `Swizzlean` package to your project. + ### Carthage -You can also use [Carthage](https://github.com/Carthage/Carthage) to manually add the Swizzlean dynamic framework to your project. +You can also use [Carthage](https://github.com/Carthage/Carthage) to manually add the `Swizzlean` framework to your project. 1. Add `github "rbaumbach/Swizzlean"` to your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile). 2. [Follow instructions to manually add](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) Swizzlean dynamic framework to your project. @@ -64,13 +71,13 @@ NSLog(@"The int value for number7 is: %d", [number7 intValue]); This project has been setup to use [fastlane](https://fastlane.tools) to run the specs. -First, run the setup.sh script to bundle required gems and Cocoapods when in the project directory: +First, run the `setup.sh` script to bundle required gems and `Cocoapods` when in the project directory: ```bash $ ./setup.sh ``` -And then use fastlane to run all the specs on the command line: +And then use `fastlane` to run all the specs on the command line: ```bash $ bundle exec fastlane specs @@ -82,8 +89,8 @@ Version history can be found [on releases page](https://github.com/rbaumbach/Swi ## Suggestions, requests, feedback and acknowledgements -Thanks for checking out Swizzlean for your swizzling needs. Any feedback can be +Thanks for checking out `Swizzlean` for your swizzling needs. Any feedback can be can be sent to: . -Thanks to the following contributors for keeping Swizzlean Swizzletastic: +Thanks to the following contributors for keeping `Swizzlean` Swizzletastic: [Erik Stromlund](https://github.com/estromlund) & [Aaron Koop](https://github.com/aaronkoop) diff --git a/Swizzlean.podspec b/Swizzlean.podspec index 6234036..1d45c7a 100644 --- a/Swizzlean.podspec +++ b/Swizzlean.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Swizzlean' - s.version = '1.0.3' + s.version = '1.1.0' s.summary = 'A quick and lean way to swizzle methods for your Objective-C development needs.' s.homepage = 'https://github.com/rbaumbach/Swizzlean' s.license = { :type => 'MIT', :file => 'MIT-LICENSE.txt' } From 481d8db2445bb8c2473697f53b3da7dac7f25819 Mon Sep 17 00:00:00 2001 From: Ryan Baumbach Date: Mon, 17 Oct 2022 20:56:14 -0600 Subject: [PATCH 3/5] Fix Info.plist placement --- Swizzlean.xcodeproj/project.pbxproj | 18 +++++------------- .../Fakes/FakeRuntimeUtils.h | 0 .../Fakes/FakeRuntimeUtils.m | 0 .../Fakes/IntegrationTestClass.h | 0 .../Fakes/IntegrationTestClass.m | 0 Tests/{ => SwizzleanTests}/Fakes/TestClass.h | 0 Tests/{ => SwizzleanTests}/Fakes/TestClass.m | 0 .../Supporting Files/Info.plist | 0 .../SwizzleanIntegrationSpec.m | 0 9 files changed, 5 insertions(+), 13 deletions(-) rename Tests/{ => SwizzleanTests}/Fakes/FakeRuntimeUtils.h (100%) rename Tests/{ => SwizzleanTests}/Fakes/FakeRuntimeUtils.m (100%) rename Tests/{ => SwizzleanTests}/Fakes/IntegrationTestClass.h (100%) rename Tests/{ => SwizzleanTests}/Fakes/IntegrationTestClass.m (100%) rename Tests/{ => SwizzleanTests}/Fakes/TestClass.h (100%) rename Tests/{ => SwizzleanTests}/Fakes/TestClass.m (100%) rename Tests/{ => SwizzleanTests}/Supporting Files/Info.plist (100%) rename Tests/{SwizzleanIntegrationTests => SwizzleanTests}/SwizzleanIntegrationSpec.m (100%) diff --git a/Swizzlean.xcodeproj/project.pbxproj b/Swizzlean.xcodeproj/project.pbxproj index 84513b3..c780d6e 100644 --- a/Swizzlean.xcodeproj/project.pbxproj +++ b/Swizzlean.xcodeproj/project.pbxproj @@ -105,14 +105,6 @@ path = include; sourceTree = ""; }; - 9409BCD228FDEF9E002B5761 /* SwizzleanIntegrationTests */ = { - isa = PBXGroup; - children = ( - 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */, - ); - path = SwizzleanIntegrationTests; - sourceTree = ""; - }; 944C7B471EA25FB5003A06C4 /* Swizzlean */ = { isa = PBXGroup; children = ( @@ -129,9 +121,6 @@ isa = PBXGroup; children = ( 946059E022DA18F100936CCF /* SwizzleanTests */, - 9409BCD228FDEF9E002B5761 /* SwizzleanIntegrationTests */, - 946059DE22DA18B500936CCF /* Fakes */, - 946059DF22DA18D800936CCF /* Supporting Files */, ); path = Tests; sourceTree = ""; @@ -162,6 +151,9 @@ children = ( 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */, 944C7B6D1EA26270003A06C4 /* RuntimeUtilsSpec.m */, + 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */, + 946059DE22DA18B500936CCF /* Fakes */, + 946059DF22DA18D800936CCF /* Supporting Files */, ); path = SwizzleanTests; sourceTree = ""; @@ -456,7 +448,7 @@ DEVELOPMENT_TEAM = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwizzleanTests/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; @@ -483,7 +475,7 @@ ENABLE_NS_ASSERTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwizzleanTests/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Tests/Fakes/FakeRuntimeUtils.h b/Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.h similarity index 100% rename from Tests/Fakes/FakeRuntimeUtils.h rename to Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.h diff --git a/Tests/Fakes/FakeRuntimeUtils.m b/Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.m similarity index 100% rename from Tests/Fakes/FakeRuntimeUtils.m rename to Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.m diff --git a/Tests/Fakes/IntegrationTestClass.h b/Tests/SwizzleanTests/Fakes/IntegrationTestClass.h similarity index 100% rename from Tests/Fakes/IntegrationTestClass.h rename to Tests/SwizzleanTests/Fakes/IntegrationTestClass.h diff --git a/Tests/Fakes/IntegrationTestClass.m b/Tests/SwizzleanTests/Fakes/IntegrationTestClass.m similarity index 100% rename from Tests/Fakes/IntegrationTestClass.m rename to Tests/SwizzleanTests/Fakes/IntegrationTestClass.m diff --git a/Tests/Fakes/TestClass.h b/Tests/SwizzleanTests/Fakes/TestClass.h similarity index 100% rename from Tests/Fakes/TestClass.h rename to Tests/SwizzleanTests/Fakes/TestClass.h diff --git a/Tests/Fakes/TestClass.m b/Tests/SwizzleanTests/Fakes/TestClass.m similarity index 100% rename from Tests/Fakes/TestClass.m rename to Tests/SwizzleanTests/Fakes/TestClass.m diff --git a/Tests/Supporting Files/Info.plist b/Tests/SwizzleanTests/Supporting Files/Info.plist similarity index 100% rename from Tests/Supporting Files/Info.plist rename to Tests/SwizzleanTests/Supporting Files/Info.plist diff --git a/Tests/SwizzleanIntegrationTests/SwizzleanIntegrationSpec.m b/Tests/SwizzleanTests/SwizzleanIntegrationSpec.m similarity index 100% rename from Tests/SwizzleanIntegrationTests/SwizzleanIntegrationSpec.m rename to Tests/SwizzleanTests/SwizzleanIntegrationSpec.m From 27a9f5e30b27f5dc868d960a95340e066a56d54e Mon Sep 17 00:00:00 2001 From: Ryan Baumbach Date: Mon, 17 Oct 2022 21:07:42 -0600 Subject: [PATCH 4/5] Use 'Specs' instead of 'Tests' --- Package.swift | 2 +- Swizzlean.xcodeproj/project.pbxproj | 30 +++++++++---------- .../xcshareddata/xcschemes/Swizzlean.xcscheme | 8 ++--- .../Fakes/FakeRuntimeUtils.h | 0 .../Fakes/FakeRuntimeUtils.m | 0 .../Fakes/IntegrationTestClass.h | 0 .../Fakes/IntegrationTestClass.m | 0 .../Fakes/TestClass.h | 0 .../Fakes/TestClass.m | 0 .../RuntimeUtilsSpec.m | 0 .../Supporting Files/Info.plist | 0 .../SwizzleanIntegrationSpec.m | 0 .../SwizzleanSpec.m | 0 13 files changed, 20 insertions(+), 20 deletions(-) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/FakeRuntimeUtils.h (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/FakeRuntimeUtils.m (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/IntegrationTestClass.h (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/IntegrationTestClass.m (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/TestClass.h (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Fakes/TestClass.m (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/RuntimeUtilsSpec.m (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/Supporting Files/Info.plist (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/SwizzleanIntegrationSpec.m (100%) rename Tests/{SwizzleanTests => SwizzleanSpecs}/SwizzleanSpec.m (100%) diff --git a/Package.swift b/Package.swift index 025f3bb..10bcc78 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( .target( name: "Swizzlean"), .testTarget( - name: "SwizzleanTests", + name: "SwizzleanSpecs", dependencies: ["Swizzlean"]) ] ) diff --git a/Swizzlean.xcodeproj/project.pbxproj b/Swizzlean.xcodeproj/project.pbxproj index c780d6e..05bf572 100644 --- a/Swizzlean.xcodeproj/project.pbxproj +++ b/Swizzlean.xcodeproj/project.pbxproj @@ -42,7 +42,7 @@ 944C7B501EA260D2003A06C4 /* RuntimeUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RuntimeUtils.m; sourceTree = ""; }; 944C7B511EA260D2003A06C4 /* Swizzlean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Swizzlean.h; sourceTree = ""; }; 944C7B521EA260D2003A06C4 /* Swizzlean.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Swizzlean.m; sourceTree = ""; }; - 944C7B5D1EA261E5003A06C4 /* Specs.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Specs.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 944C7B5D1EA261E5003A06C4 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 944C7B611EA261E5003A06C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 944C7B6A1EA26251003A06C4 /* FakeRuntimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FakeRuntimeUtils.h; sourceTree = ""; }; 944C7B6B1EA26251003A06C4 /* FakeRuntimeUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FakeRuntimeUtils.m; sourceTree = ""; }; @@ -120,7 +120,7 @@ 944C7B5E1EA261E5003A06C4 /* Tests */ = { isa = PBXGroup; children = ( - 946059E022DA18F100936CCF /* SwizzleanTests */, + 946059E022DA18F100936CCF /* SwizzleanSpecs */, ); path = Tests; sourceTree = ""; @@ -146,7 +146,7 @@ path = "Supporting Files"; sourceTree = ""; }; - 946059E022DA18F100936CCF /* SwizzleanTests */ = { + 946059E022DA18F100936CCF /* SwizzleanSpecs */ = { isa = PBXGroup; children = ( 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */, @@ -155,7 +155,7 @@ 946059DE22DA18B500936CCF /* Fakes */, 946059DF22DA18D800936CCF /* Supporting Files */, ); - path = SwizzleanTests; + path = SwizzleanSpecs; sourceTree = ""; }; 946059E422DA1EBB00936CCF /* Supporting Files */ = { @@ -182,7 +182,7 @@ isa = PBXGroup; children = ( 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */, - 944C7B5D1EA261E5003A06C4 /* Specs.xctest */, + 944C7B5D1EA261E5003A06C4 /* Tests.xctest */, ); name = Products; sourceTree = ""; @@ -229,9 +229,9 @@ productReference = 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */; productType = "com.apple.product-type.framework"; }; - 944C7B5C1EA261E5003A06C4 /* Specs */ = { + 944C7B5C1EA261E5003A06C4 /* Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 944C7B651EA261E5003A06C4 /* Build configuration list for PBXNativeTarget "Specs" */; + buildConfigurationList = 944C7B651EA261E5003A06C4 /* Build configuration list for PBXNativeTarget "Tests" */; buildPhases = ( 578D50B06C3349689E7C685C /* [CP] Check Pods Manifest.lock */, 944C7B591EA261E5003A06C4 /* Sources */, @@ -243,9 +243,9 @@ dependencies = ( 944C7B641EA261E5003A06C4 /* PBXTargetDependency */, ); - name = Specs; + name = Tests; productName = Specs; - productReference = 944C7B5D1EA261E5003A06C4 /* Specs.xctest */; + productReference = 944C7B5D1EA261E5003A06C4 /* Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -283,7 +283,7 @@ projectRoot = ""; targets = ( 944C7B451EA25FB5003A06C4 /* Swizzlean */, - 944C7B5C1EA261E5003A06C4 /* Specs */, + 944C7B5C1EA261E5003A06C4 /* Tests */, ); }; /* End PBXProject section */ @@ -448,11 +448,11 @@ DEVELOPMENT_TEAM = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Tests/SwizzleanTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwizzleanSpecs/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.rkb.Specs; + PRODUCT_BUNDLE_IDENTIFIER = com.rkb.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -475,11 +475,11 @@ ENABLE_NS_ASSERTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "Tests/SwizzleanTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwizzleanSpecs/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.rkb.Specs; + PRODUCT_BUNDLE_IDENTIFIER = com.rkb.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -594,7 +594,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 944C7B651EA261E5003A06C4 /* Build configuration list for PBXNativeTarget "Specs" */ = { + 944C7B651EA261E5003A06C4 /* Build configuration list for PBXNativeTarget "Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 944C7B661EA261E5003A06C4 /* Debug */, diff --git a/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean.xcscheme b/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean.xcscheme index 55a929e..be69409 100644 --- a/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean.xcscheme +++ b/Swizzlean.xcodeproj/xcshareddata/xcschemes/Swizzlean.xcscheme @@ -42,8 +42,8 @@ diff --git a/Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.h b/Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.h similarity index 100% rename from Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.h rename to Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.h diff --git a/Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.m b/Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.m similarity index 100% rename from Tests/SwizzleanTests/Fakes/FakeRuntimeUtils.m rename to Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.m diff --git a/Tests/SwizzleanTests/Fakes/IntegrationTestClass.h b/Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.h similarity index 100% rename from Tests/SwizzleanTests/Fakes/IntegrationTestClass.h rename to Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.h diff --git a/Tests/SwizzleanTests/Fakes/IntegrationTestClass.m b/Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.m similarity index 100% rename from Tests/SwizzleanTests/Fakes/IntegrationTestClass.m rename to Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.m diff --git a/Tests/SwizzleanTests/Fakes/TestClass.h b/Tests/SwizzleanSpecs/Fakes/TestClass.h similarity index 100% rename from Tests/SwizzleanTests/Fakes/TestClass.h rename to Tests/SwizzleanSpecs/Fakes/TestClass.h diff --git a/Tests/SwizzleanTests/Fakes/TestClass.m b/Tests/SwizzleanSpecs/Fakes/TestClass.m similarity index 100% rename from Tests/SwizzleanTests/Fakes/TestClass.m rename to Tests/SwizzleanSpecs/Fakes/TestClass.m diff --git a/Tests/SwizzleanTests/RuntimeUtilsSpec.m b/Tests/SwizzleanSpecs/RuntimeUtilsSpec.m similarity index 100% rename from Tests/SwizzleanTests/RuntimeUtilsSpec.m rename to Tests/SwizzleanSpecs/RuntimeUtilsSpec.m diff --git a/Tests/SwizzleanTests/Supporting Files/Info.plist b/Tests/SwizzleanSpecs/Supporting Files/Info.plist similarity index 100% rename from Tests/SwizzleanTests/Supporting Files/Info.plist rename to Tests/SwizzleanSpecs/Supporting Files/Info.plist diff --git a/Tests/SwizzleanTests/SwizzleanIntegrationSpec.m b/Tests/SwizzleanSpecs/SwizzleanIntegrationSpec.m similarity index 100% rename from Tests/SwizzleanTests/SwizzleanIntegrationSpec.m rename to Tests/SwizzleanSpecs/SwizzleanIntegrationSpec.m diff --git a/Tests/SwizzleanTests/SwizzleanSpec.m b/Tests/SwizzleanSpecs/SwizzleanSpec.m similarity index 100% rename from Tests/SwizzleanTests/SwizzleanSpec.m rename to Tests/SwizzleanSpecs/SwizzleanSpec.m From 5140d1c4ec3985ef368d5e4c142f2cc6d09bc46f Mon Sep 17 00:00:00 2001 From: Ryan Baumbach Date: Tue, 18 Oct 2022 10:19:11 -0600 Subject: [PATCH 5/5] Fix Podfile --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index bcf8132..2d69417 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, "8.0" inhibit_all_warnings! -target :Specs do +target :Tests do pod 'Specta' pod 'Expecta' pod 'OCMock'