Skip to content

Commit

Permalink
Merge pull request #143 from square/dfed--dependabot
Browse files Browse the repository at this point in the history 
Update Cocoapods + bundle
  • Loading branch information
@dfed
dfed authored Oct 30, 2024
2 parents 2bab9fe + 9df83a6 commit 934efe7
Show file tree
Hide file tree
Showing 20 changed files with 122 additions and 265 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.4
3.3.5
149 changes: 39 additions & 110 deletions Example/ParalayoutDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */
Expand All @@ -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 = "<group>"; };
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 = "<group>"; };
3D08A2B6274EFB0F00F13EB0 /* ViewSpreadingSnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewSpreadingSnapshotTests.swift; sourceTree = "<group>"; };
Expand All @@ -47,25 +46,22 @@
3D0BEED52604854C00C728FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3D0BEEF12605598500C728FA /* SnapshotTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTestCase.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
3D0BEEA826047F6400C728FA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BE56DECC24CB86EBC45FB81B /* Pods_ParalayoutDemo.framework in Frameworks */,
32C02C4C2CD28326009CAA89 /* Paralayout in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3D0BEECE2604854C00C728FA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
236CDCA250E4E62FD927638E /* Pods_ParalayoutDemo_ParalayoutSnapshotTests.framework in Frameworks */,
32C02C4F2CD2836E009CAA89 /* SnapshotTesting in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -78,7 +74,6 @@
3D0BEEAD26047F6400C728FA /* ParalayoutDemo */,
3D0BEED22604854C00C728FA /* ParalayoutSnapshotTests */,
3D0BEEAC26047F6400C728FA /* Products */,
7E0941CD49D94306CE8399B6 /* Pods */,
A2A4EAD12583EFDA5AA16EAC /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -117,17 +112,6 @@
path = ParalayoutSnapshotTests;
sourceTree = "<group>";
};
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 = "<group>";
};
A2A4EAD12583EFDA5AA16EAC /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand All @@ -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 = (
);
Expand All @@ -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 = (
);
Expand Down Expand Up @@ -206,6 +186,10 @@
Base,
);
mainGroup = 3D0BEEA226047F6400C728FA;
packageReferences = (
32C02C4A2CD28326009CAA89 /* XCLocalSwiftPackageReference "../../Paralayout" */,
32C02C4D2CD2836E009CAA89 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
);
productRefGroup = 3D0BEEAC26047F6400C728FA /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -520,7 +421,6 @@
};
3D0BEED92604854C00C728FA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F0EE39C2249F3A3CBAE7BE68 /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -540,7 +440,6 @@
};
3D0BEEDA2604854C00C728FA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 66DA0A22B6BAC3A9DB54080E /* Pods-ParalayoutDemo-ParalayoutSnapshotTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -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 */;
}
24 changes: 24 additions & 0 deletions Example/ParalayoutDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -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
}
Loading

0 comments on commit 934efe7

Please sign in to comment.