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..10bcc78 --- /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: "SwizzleanSpecs", + dependencies: ["Swizzlean"]) + ] +) diff --git a/Podfile b/Podfile index ff612d0..2d69417 100644 --- a/Podfile +++ b/Podfile @@ -3,13 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, "8.0" inhibit_all_warnings! -target :Specs do - pod 'Specta' - pod 'Expecta' - pod 'OCMock' -end - -target :IntegrationSpecs do +target :Tests do pod 'Specta' pod 'Expecta' pod 'OCMock' 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/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/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.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' } diff --git a/Swizzlean.xcodeproj/project.pbxproj b/Swizzlean.xcodeproj/project.pbxproj index 42446ef..05bf572 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,26 +29,20 @@ 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 = ""; }; 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 = ""; }; @@ -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,38 +89,47 @@ name = Pods; sourceTree = ""; }; - 944C7B471EA25FB5003A06C4 /* Swizzlean */ = { + 9409BCD028FDE934002B5761 /* Sources */ = { isa = PBXGroup; children = ( - 946059E522DA1EEA00936CCF /* Source */, - 946059E422DA1EBB00936CCF /* Supporting Files */, + 944C7B471EA25FB5003A06C4 /* Swizzlean */, ); - path = Swizzlean; + path = Sources; sourceTree = ""; }; - 944C7B5E1EA261E5003A06C4 /* Specs */ = { + 9409BCD128FDED63002B5761 /* include */ = { isa = PBXGroup; children = ( - 946059E022DA18F100936CCF /* Swizzlean */, - 946059DE22DA18B500936CCF /* Fakes */, - 946059DF22DA18D800936CCF /* Supporting Files */, + 944C7B511EA260D2003A06C4 /* Swizzlean.h */, ); - path = Specs; + path = include; sourceTree = ""; }; - 944C7B7A1EA2643A003A06C4 /* IntegrationSpecs */ = { + 944C7B471EA25FB5003A06C4 /* Swizzlean */ = { isa = PBXGroup; children = ( - 946059E222DA1E4000936CCF /* Swizzlean */, - 946059E122DA1E3600936CCF /* Fakes */, - 946059E322DA1E5400936CCF /* Supporting Files */, + 9409BCD128FDED63002B5761 /* include */, + 944C7B521EA260D2003A06C4 /* Swizzlean.m */, + 944C7B4F1EA260D2003A06C4 /* RuntimeUtils.h */, + 944C7B501EA260D2003A06C4 /* RuntimeUtils.m */, + 946059E422DA1EBB00936CCF /* Supporting Files */, + ); + path = Swizzlean; + sourceTree = ""; + }; + 944C7B5E1EA261E5003A06C4 /* Tests */ = { + isa = PBXGroup; + children = ( + 946059E022DA18F100936CCF /* SwizzleanSpecs */, ); - path = IntegrationSpecs; + path = Tests; sourceTree = ""; }; 946059DE22DA18B500936CCF /* Fakes */ = { isa = PBXGroup; children = ( + 944C7B861EA2648A003A06C4 /* IntegrationTestClass.h */, + 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */, 944C7B711EA26277003A06C4 /* TestClass.h */, 944C7B721EA26277003A06C4 /* TestClass.m */, 944C7B6A1EA26251003A06C4 /* FakeRuntimeUtils.h */, @@ -156,38 +146,16 @@ path = "Supporting Files"; sourceTree = ""; }; - 946059E022DA18F100936CCF /* Swizzlean */ = { + 946059E022DA18F100936CCF /* SwizzleanSpecs */ = { isa = PBXGroup; children = ( 944C7B6E1EA26270003A06C4 /* SwizzleanSpec.m */, 944C7B6D1EA26270003A06C4 /* RuntimeUtilsSpec.m */, - ); - path = Swizzlean; - sourceTree = ""; - }; - 946059E122DA1E3600936CCF /* Fakes */ = { - isa = PBXGroup; - children = ( - 944C7B861EA2648A003A06C4 /* IntegrationTestClass.h */, - 944C7B871EA2648A003A06C4 /* IntegrationTestClass.m */, - ); - path = Fakes; - sourceTree = ""; - }; - 946059E222DA1E4000936CCF /* Swizzlean */ = { - isa = PBXGroup; - children = ( 944C7B891EA26492003A06C4 /* SwizzleanIntegrationSpec.m */, + 946059DE22DA18B500936CCF /* Fakes */, + 946059DF22DA18D800936CCF /* Supporting Files */, ); - path = Swizzlean; - sourceTree = ""; - }; - 946059E322DA1E5400936CCF /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 944C7B7D1EA2643A003A06C4 /* Info.plist */, - ); - path = "Supporting Files"; + path = SwizzleanSpecs; sourceTree = ""; }; 946059E422DA1EBB00936CCF /* Supporting Files */ = { @@ -198,23 +166,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 */, @@ -225,8 +182,7 @@ isa = PBXGroup; children = ( 944C7B461EA25FB5003A06C4 /* Swizzlean.framework */, - 944C7B5D1EA261E5003A06C4 /* Specs.xctest */, - 944C7B791EA2643A003A06C4 /* IntegrationSpecs.xctest */, + 944C7B5D1EA261E5003A06C4 /* Tests.xctest */, ); name = Products; sourceTree = ""; @@ -273,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 */, @@ -287,28 +243,9 @@ dependencies = ( 944C7B641EA261E5003A06C4 /* PBXTargetDependency */, ); - name = Specs; + name = Tests; productName = Specs; - 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 */; + productReference = 944C7B5D1EA261E5003A06C4 /* Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -323,16 +260,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" */; @@ -349,8 +283,7 @@ projectRoot = ""; targets = ( 944C7B451EA25FB5003A06C4 /* Swizzlean */, - 944C7B5C1EA261E5003A06C4 /* Specs */, - 944C7B781EA2643A003A06C4 /* IntegrationSpecs */, + 944C7B5C1EA261E5003A06C4 /* Tests */, ); }; /* End PBXProject section */ @@ -370,13 +303,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 944C7B771EA2643A003A06C4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -398,24 +324,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 +340,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 +357,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 +379,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 +388,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 +417,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 +426,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,11 +448,11 @@ 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/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 = ""; }; @@ -576,63 +475,11 @@ 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/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_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - }; - 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_BUNDLE_IDENTIFIER = com.rkb.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -747,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 */, @@ -756,15 +603,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/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/Specs/Fakes/FakeRuntimeUtils.h b/Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.h similarity index 100% rename from Specs/Fakes/FakeRuntimeUtils.h rename to Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.h diff --git a/Specs/Fakes/FakeRuntimeUtils.m b/Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.m similarity index 100% rename from Specs/Fakes/FakeRuntimeUtils.m rename to Tests/SwizzleanSpecs/Fakes/FakeRuntimeUtils.m diff --git a/IntegrationSpecs/Fakes/IntegrationTestClass.h b/Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.h similarity index 100% rename from IntegrationSpecs/Fakes/IntegrationTestClass.h rename to Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.h diff --git a/IntegrationSpecs/Fakes/IntegrationTestClass.m b/Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.m similarity index 100% rename from IntegrationSpecs/Fakes/IntegrationTestClass.m rename to Tests/SwizzleanSpecs/Fakes/IntegrationTestClass.m diff --git a/Specs/Fakes/TestClass.h b/Tests/SwizzleanSpecs/Fakes/TestClass.h similarity index 100% rename from Specs/Fakes/TestClass.h rename to Tests/SwizzleanSpecs/Fakes/TestClass.h diff --git a/Specs/Fakes/TestClass.m b/Tests/SwizzleanSpecs/Fakes/TestClass.m similarity index 100% rename from Specs/Fakes/TestClass.m rename to Tests/SwizzleanSpecs/Fakes/TestClass.m diff --git a/Specs/Swizzlean/RuntimeUtilsSpec.m b/Tests/SwizzleanSpecs/RuntimeUtilsSpec.m similarity index 100% rename from Specs/Swizzlean/RuntimeUtilsSpec.m rename to Tests/SwizzleanSpecs/RuntimeUtilsSpec.m diff --git a/IntegrationSpecs/Supporting Files/Info.plist b/Tests/SwizzleanSpecs/Supporting Files/Info.plist similarity index 100% rename from IntegrationSpecs/Supporting Files/Info.plist rename to Tests/SwizzleanSpecs/Supporting Files/Info.plist diff --git a/IntegrationSpecs/Swizzlean/SwizzleanIntegrationSpec.m b/Tests/SwizzleanSpecs/SwizzleanIntegrationSpec.m similarity index 100% rename from IntegrationSpecs/Swizzlean/SwizzleanIntegrationSpec.m rename to Tests/SwizzleanSpecs/SwizzleanIntegrationSpec.m diff --git a/Specs/Swizzlean/SwizzleanSpec.m b/Tests/SwizzleanSpecs/SwizzleanSpec.m similarity index 100% rename from Specs/Swizzlean/SwizzleanSpec.m rename to Tests/SwizzleanSpecs/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|