diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6248ec8..ad8632d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,15 +18,13 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.5' - name: Checkout Repo uses: actions/checkout@v4 - name: Select Xcode Version run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer - name: Bundle Install run: bundle install - - name: Pod Install - run: bundle exec pod install --project-directory=Example - name: Build and Test run: Scripts/build.swift xcode ${{ matrix.platform }} `which xcpretty` - name: Upload Results @@ -42,7 +40,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.5' - name: Checkout Repo uses: actions/checkout@v4 - name: Bundle Install @@ -62,7 +60,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.5' - name: Checkout Repo uses: actions/checkout@v4 - name: Select Xcode Version @@ -80,7 +78,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.5' - name: Checkout Repo uses: actions/checkout@v4 - name: Select Xcode Version @@ -94,7 +92,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.5' - name: Checkout Repo uses: actions/checkout@v4 - name: Select Xcode Version diff --git a/.ruby-version b/.ruby-version index a0891f5..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.3.5 diff --git a/Example/ParalayoutDemo.xcodeproj/project.pbxproj b/Example/ParalayoutDemo.xcodeproj/project.pbxproj index 61ac173..be0c2ae 100644 --- a/Example/ParalayoutDemo.xcodeproj/project.pbxproj +++ b/Example/ParalayoutDemo.xcodeproj/project.pbxproj @@ -3,11 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ - 236CDCA250E4E62FD927638E /* Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56BC1C4B5B8050608972ED18 /* Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework */; }; + 32C02C4C2CD28326009CAA89 /* Paralayout in Frameworks */ = {isa = PBXBuildFile; productRef = 32C02C4B2CD28326009CAA89 /* Paralayout */; }; + 32C02C4F2CD2836E009CAA89 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 32C02C4E2CD2836E009CAA89 /* SnapshotTesting */; }; 3D074A0C27436A9E0095B8AE /* ViewAlignmentSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D074A0B27436A9E0095B8AE /* ViewAlignmentSnapshotTests.swift */; }; 3D08A2B7274EFB0F00F13EB0 /* ViewSpreadingSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D08A2B6274EFB0F00F13EB0 /* ViewSpreadingSnapshotTests.swift */; }; 3D0BEEAF26047F6400C728FA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D0BEEAE26047F6400C728FA /* AppDelegate.swift */; }; @@ -17,7 +18,6 @@ 3D0BEEBB26047F6600C728FA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3D0BEEB926047F6600C728FA /* LaunchScreen.storyboard */; }; 3D0BEED42604854C00C728FA /* ViewDistributionSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D0BEED32604854C00C728FA /* ViewDistributionSnapshotTests.swift */; }; 3D0BEEF22605598500C728FA /* SnapshotTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D0BEEF12605598500C728FA /* SnapshotTestCase.swift */; }; - BE56DECC24CB86EBC45FB81B /* Pods_ParalayoutDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B4977CFAD5319FFF0258BF8 /* Pods_ParalayoutDemo.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,7 +31,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 098A230C2918ED70E7FB0FC5 /* Pods-ParalayoutDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParalayoutDemo.release.xcconfig"; path = "Target Support Files/Pods-ParalayoutDemo/Pods-ParalayoutDemo.release.xcconfig"; sourceTree = ""; }; 2B4977CFAD5319FFF0258BF8 /* Pods_ParalayoutDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParalayoutDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3D074A0B27436A9E0095B8AE /* ViewAlignmentSnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewAlignmentSnapshotTests.swift; sourceTree = ""; }; 3D08A2B6274EFB0F00F13EB0 /* ViewSpreadingSnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewSpreadingSnapshotTests.swift; sourceTree = ""; }; @@ -47,9 +46,6 @@ 3D0BEED52604854C00C728FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3D0BEEF12605598500C728FA /* SnapshotTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTestCase.swift; sourceTree = ""; }; 56BC1C4B5B8050608972ED18 /* Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 66DA0A22B6BAC3A9DB54080E /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig"; path = "Target Support Files/Pods-ParalayoutDemo-ParalayoutSnapshotTests/Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig"; sourceTree = ""; }; - A103ABF2C8967E513AA8A2A1 /* Pods-ParalayoutDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParalayoutDemo.debug.xcconfig"; path = "Target Support Files/Pods-ParalayoutDemo/Pods-ParalayoutDemo.debug.xcconfig"; sourceTree = ""; }; - F0EE39C2249F3A3CBAE7BE68 /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig"; path = "Target Support Files/Pods-ParalayoutDemo-ParalayoutSnapshotTests/Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BE56DECC24CB86EBC45FB81B /* Pods_ParalayoutDemo.framework in Frameworks */, + 32C02C4C2CD28326009CAA89 /* Paralayout in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -65,7 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 236CDCA250E4E62FD927638E /* Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework in Frameworks */, + 32C02C4F2CD2836E009CAA89 /* SnapshotTesting in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -78,7 +74,6 @@ 3D0BEEAD26047F6400C728FA /* ParalayoutDemo */, 3D0BEED22604854C00C728FA /* ParalayoutSnapshotTests */, 3D0BEEAC26047F6400C728FA /* Products */, - 7E0941CD49D94306CE8399B6 /* Pods */, A2A4EAD12583EFDA5AA16EAC /* Frameworks */, ); sourceTree = ""; @@ -117,17 +112,6 @@ path = ParalayoutSnapshotTests; sourceTree = ""; }; - 7E0941CD49D94306CE8399B6 /* Pods */ = { - isa = PBXGroup; - children = ( - A103ABF2C8967E513AA8A2A1 /* Pods-ParalayoutDemo.debug.xcconfig */, - 098A230C2918ED70E7FB0FC5 /* Pods-ParalayoutDemo.release.xcconfig */, - F0EE39C2249F3A3CBAE7BE68 /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig */, - 66DA0A22B6BAC3A9DB54080E /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; A2A4EAD12583EFDA5AA16EAC /* Frameworks */ = { isa = PBXGroup; children = ( @@ -144,11 +128,9 @@ isa = PBXNativeTarget; buildConfigurationList = 3D0BEEBF26047F6600C728FA /* Build configuration list for PBXNativeTarget "ParalayoutDemo" */; buildPhases = ( - F763318CE664BA5D8B464D85 /* [CP] Check Pods Manifest.lock */, 3D0BEEA726047F6400C728FA /* Sources */, 3D0BEEA826047F6400C728FA /* Frameworks */, 3D0BEEA926047F6400C728FA /* Resources */, - 1BD1D0A67328C731C4E74DA0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -163,11 +145,9 @@ isa = PBXNativeTarget; buildConfigurationList = 3D0BEED82604854C00C728FA /* Build configuration list for PBXNativeTarget "ParalayoutSnapshotTests" */; buildPhases = ( - F7CF82FDE9ED2847602BED00 /* [CP] Check Pods Manifest.lock */, 3D0BEECD2604854C00C728FA /* Sources */, 3D0BEECE2604854C00C728FA /* Frameworks */, 3D0BEECF2604854C00C728FA /* Resources */, - 43AAEBD75AF5387DC6D56563 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -206,6 +186,10 @@ Base, ); mainGroup = 3D0BEEA226047F6400C728FA; + packageReferences = ( + 32C02C4A2CD28326009CAA89 /* XCLocalSwiftPackageReference "../../Paralayout" */, + 32C02C4D2CD2836E009CAA89 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */, + ); productRefGroup = 3D0BEEAC26047F6400C728FA /* Products */; projectDirPath = ""; projectRoot = ""; @@ -235,87 +219,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 1BD1D0A67328C731C4E74DA0 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo/Pods-ParalayoutDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo/Pods-ParalayoutDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo/Pods-ParalayoutDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 43AAEBD75AF5387DC6D56563 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo-ParalayoutSnapshotTests/Pods-ParalayoutDemo-ParalayoutSnapshotTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo-ParalayoutSnapshotTests/Pods-ParalayoutDemo-ParalayoutSnapshotTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ParalayoutDemo-ParalayoutSnapshotTests/Pods-ParalayoutDemo-ParalayoutSnapshotTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - F763318CE664BA5D8B464D85 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ParalayoutDemo-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; - }; - F7CF82FDE9ED2847602BED00 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ParalayoutDemo-ParalayoutSnapshotTests-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 */ 3D0BEEA726047F6400C728FA /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -480,7 +383,6 @@ }; 3D0BEEC026047F6600C728FA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A103ABF2C8967E513AA8A2A1 /* Pods-ParalayoutDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -500,7 +402,6 @@ }; 3D0BEEC126047F6600C728FA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 098A230C2918ED70E7FB0FC5 /* Pods-ParalayoutDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -520,7 +421,6 @@ }; 3D0BEED92604854C00C728FA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F0EE39C2249F3A3CBAE7BE68 /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -540,7 +440,6 @@ }; 3D0BEEDA2604854C00C728FA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 66DA0A22B6BAC3A9DB54080E /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -589,6 +488,36 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 32C02C4A2CD28326009CAA89 /* XCLocalSwiftPackageReference "../../Paralayout" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../Paralayout; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 32C02C4D2CD2836E009CAA89 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.17.6; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 32C02C4B2CD28326009CAA89 /* Paralayout */ = { + isa = XCSwiftPackageProductDependency; + productName = Paralayout; + }; + 32C02C4E2CD2836E009CAA89 /* SnapshotTesting */ = { + isa = XCSwiftPackageProductDependency; + package = 32C02C4D2CD2836E009CAA89 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; + productName = SnapshotTesting; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 3D0BEEA326047F6400C728FA /* Project object */; } diff --git a/Example/ParalayoutDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ParalayoutDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..7d88045 --- /dev/null +++ b/Example/ParalayoutDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,24 @@ +{ + "originHash" : "2b0e5e17a009415bca32c5d97c033294e3caa1062e96bd668230c00a110e839e", + "pins" : [ + { + "identity" : "swift-snapshot-testing", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git", + "state" : { + "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7", + "version" : "1.17.6" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-syntax", + "state" : { + "revision" : "0687f71944021d616d34d922343dcef086855920", + "version" : "600.0.1" + } + } + ], + "version" : 3 +} diff --git a/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/Paralayout.xcscheme b/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/Paralayout.xcscheme index f879f87..69d2e13 100644 --- a/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/Paralayout.xcscheme +++ b/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/Paralayout.xcscheme @@ -14,10 +14,10 @@ buildForAnalyzing = "YES"> + ReferencedContainer = "container:.."> @@ -28,6 +28,16 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + ReferencedContainer = "container:.."> diff --git a/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/ParalayoutDemo.xcscheme b/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/ParalayoutDemo.xcscheme index c3fa31f..33d9cc5 100644 --- a/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/ParalayoutDemo.xcscheme +++ b/Example/ParalayoutDemo.xcodeproj/xcshareddata/xcschemes/ParalayoutDemo.xcscheme @@ -20,20 +20,6 @@ ReferencedContainer = "container:ParalayoutDemo.xcodeproj"> - - - - - - - - - - - - - - diff --git a/Example/ParalayoutDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/ParalayoutDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/Example/ParalayoutDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Example/ParalayoutSnapshotTests/ViewAlignmentSnapshotTests.swift b/Example/ParalayoutSnapshotTests/ViewAlignmentSnapshotTests.swift index dd549d6..4fc6b50 100644 --- a/Example/ParalayoutSnapshotTests/ViewAlignmentSnapshotTests.swift +++ b/Example/ParalayoutSnapshotTests/ViewAlignmentSnapshotTests.swift @@ -16,6 +16,7 @@ import Paralayout import SnapshotTesting +import UIKit final class ViewAlignmentSnapshotTests: SnapshotTestCase { diff --git a/Example/ParalayoutSnapshotTests/ViewDistributionSnapshotTests.swift b/Example/ParalayoutSnapshotTests/ViewDistributionSnapshotTests.swift index fe2a06b..2634e25 100644 --- a/Example/ParalayoutSnapshotTests/ViewDistributionSnapshotTests.swift +++ b/Example/ParalayoutSnapshotTests/ViewDistributionSnapshotTests.swift @@ -16,6 +16,7 @@ import Paralayout import SnapshotTesting +import UIKit final class ViewDistributionSnapshotTests: SnapshotTestCase { diff --git a/Example/ParalayoutSnapshotTests/ViewSpreadingSnapshotTests.swift b/Example/ParalayoutSnapshotTests/ViewSpreadingSnapshotTests.swift index b86c8c8..bdb52f6 100644 --- a/Example/ParalayoutSnapshotTests/ViewSpreadingSnapshotTests.swift +++ b/Example/ParalayoutSnapshotTests/ViewSpreadingSnapshotTests.swift @@ -16,6 +16,7 @@ import Paralayout import SnapshotTesting +import UIKit final class ViewSpeadingSnapshotTests: SnapshotTestCase { diff --git a/Example/Podfile b/Example/Podfile deleted file mode 100644 index deeb8d5..0000000 --- a/Example/Podfile +++ /dev/null @@ -1,11 +0,0 @@ -platform :ios, '12.0' - -target 'ParalayoutDemo' do - use_frameworks! - - pod 'Paralayout', :path => '../Paralayout.podspec', :testspecs => ['Tests'] - - target 'ParalayoutSnapshotTests' do - pod 'SnapshotTesting', '~> 1.8' - end -end diff --git a/Example/Podfile.lock b/Example/Podfile.lock deleted file mode 100644 index a0f9748..0000000 --- a/Example/Podfile.lock +++ /dev/null @@ -1,25 +0,0 @@ -PODS: - - Paralayout (1.1.0) - - Paralayout/Tests (1.1.0) - - SnapshotTesting (1.8.2) - -DEPENDENCIES: - - Paralayout (from `../Paralayout.podspec`) - - Paralayout/Tests (from `../Paralayout.podspec`) - - SnapshotTesting (~> 1.8) - -SPEC REPOS: - trunk: - - SnapshotTesting - -EXTERNAL SOURCES: - Paralayout: - :path: "../Paralayout.podspec" - -SPEC CHECKSUMS: - Paralayout: 148233f7ff311384bcb209bf0b1b8a1578ad1d34 - SnapshotTesting: 38947050d13960d57a4a9c166fcf51bca7d56970 - -PODFILE CHECKSUM: f0cdc6633e8d65e479af433fa427d7c0ce7c72b1 - -COCOAPODS: 1.15.2 diff --git a/Gemfile b/Gemfile index 4bfddaa..dac62b0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ -source 'https://rubygems.org' do - gem 'cocoapods', '~> 1.14' -end +ruby '3.3.5' + +source 'https://rubygems.org' + +gem 'cocoapods', '~> 1.16.0' diff --git a/Gemfile.lock b/Gemfile.lock index b6f8c17..a9584b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,3 @@ -GEM - specs: - GEM remote: https://rubygems.org/ specs: @@ -8,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.2.1) + activesupport (7.2.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -28,10 +25,10 @@ GEM base64 (0.2.0) bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.15.2) + cocoapods (1.16.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.16.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -45,8 +42,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.15.2) + xcodeproj (>= 1.26.0, < 2.0) + cocoapods-core (1.16.1) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -77,39 +74,40 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.2) - logger (1.6.0) + json (2.7.5) + logger (1.6.1) minitest (5.25.1) molinillo (0.8.0) - nanaimo (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.3.6) - strscan + rexml (3.3.9) ruby-macho (2.5.1) securerandom (0.3.1) - strscan (3.1.0) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.25.0) + xcodeproj (1.26.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.14)! + cocoapods (~> 1.16.0) + +RUBY VERSION + ruby 3.3.5p100 BUNDLED WITH 2.5.11 diff --git a/Paralayout.podspec b/Paralayout.podspec index 2ded969..6580499 100644 --- a/Paralayout.podspec +++ b/Paralayout.podspec @@ -6,10 +6,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/square/Paralayout' s.authors = 'Square' s.source = { :git => 'https://github.com/square/Paralayout.git', :tag => s.version } + s.swift_version = '6.0' s.source_files = 'Paralayout/*.{swift}' s.ios.deployment_target = '13.0' - - s.test_spec 'Tests' do |test_spec| - test_spec.source_files = 'ParalayoutTests/*{.swift}' - end end diff --git a/Paralayout/Paralayout.h b/Paralayout/Paralayout.h deleted file mode 100644 index 9a7819b..0000000 --- a/Paralayout/Paralayout.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// Copyright © 2017 Square, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -//    http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#import - - -//! Project version number for Paralayout. -FOUNDATION_EXPORT double ParalayoutVersionNumber; - -//! Project version string for Paralayout. -FOUNDATION_EXPORT const unsigned char ParalayoutVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import diff --git a/ParalayoutTests/DistributionTests.swift b/ParalayoutTests/DistributionTests.swift index b869fd6..070a16a 100644 --- a/ParalayoutTests/DistributionTests.swift +++ b/ParalayoutTests/DistributionTests.swift @@ -15,8 +15,8 @@ // import Paralayout -import XCTest import UIKit +import XCTest final class DistributionTests: XCTestCase { diff --git a/ParalayoutTests/ViewDistributionBuilderTests.swift b/ParalayoutTests/ViewDistributionBuilderTests.swift index 86d0a3c..3e0cbc9 100644 --- a/ParalayoutTests/ViewDistributionBuilderTests.swift +++ b/ParalayoutTests/ViewDistributionBuilderTests.swift @@ -205,16 +205,16 @@ extension ViewDistributionItem: Swift.Equatable { // TODO: `@retroactive Equatab public static func == (lhs: ViewDistributionItem, rhs: ViewDistributionItem) -> Bool { switch (lhs, rhs) { case let (.view(lhsView, lhsEdgeInsets), .view(rhsView, rhsEdgeInsets)): - return lhsView === rhsView + lhsView === rhsView && lhsEdgeInsets == rhsEdgeInsets case let (.fixed(lhsFixed), .fixed(rhsFixed)): - return lhsFixed == rhsFixed + lhsFixed == rhsFixed case let (.flexible(lhsFlexible), .flexible(rhsFlexible)): - return lhsFlexible == rhsFlexible + lhsFlexible == rhsFlexible case (.view, _), (.fixed, _), (.flexible, _): - return false + false } } } diff --git a/Scripts/build.swift b/Scripts/build.swift index f419cc2..db97f96 100755 --- a/Scripts/build.swift +++ b/Scripts/build.swift @@ -74,12 +74,12 @@ enum Task: String, CustomStringConvertible { case spm case xcode - var workspace: String? { + var xcodeproj: String? { switch self { case .spm: return nil case .xcode: - return "Example/ParalayoutDemo.xcworkspace" + return "Example/ParalayoutDemo.xcodeproj" } } @@ -88,7 +88,7 @@ enum Task: String, CustomStringConvertible { case .spm: return "Paralayout" case .xcode: - return "ParalayoutDemo" + return "Paralayout" } } @@ -126,9 +126,9 @@ guard let platform = Platform(rawValue: rawPlatform) else { var xcodeBuildArguments: [String] = [] -if let workspace = task.workspace { - xcodeBuildArguments.append("-workspace") - xcodeBuildArguments.append(workspace) +if let xcodeproj = task.xcodeproj { + xcodeBuildArguments.append("-project") + xcodeBuildArguments.append(xcodeproj) } if let configuration = task.configuration {