From faaaa2370e67d8699486f7f93b8ee546d1d7e0f2 Mon Sep 17 00:00:00 2001 From: banjun Date: Wed, 26 Aug 2020 19:49:42 +0900 Subject: [PATCH 1/2] workaround for fix-carthage script --- fix-carthage-paths.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fix-carthage-paths.rb b/fix-carthage-paths.rb index 378baf39f..88d82a0ff 100644 --- a/fix-carthage-paths.rb +++ b/fix-carthage-paths.rb @@ -8,7 +8,7 @@ dependenciesGroup = project["Dependencies"] #Open dependencies-state.json file -file = File.read(".build/dependencies-state.json") +file = File.read(".build/workspace-state.json") json = JSON.parse(file) dependenciesGroup.recursive_children_groups.each do |child| @@ -40,6 +40,6 @@ end end -File.open(".build/dependencies-state.json","w") do |f| +File.open(".build/workspace-state.json","w") do |f| f.write(json.to_json) end From e924a757f9b224725af02a81d35c726334736b20 Mon Sep 17 00:00:00 2001 From: banjun Date: Wed, 26 Aug 2020 21:13:48 +0900 Subject: [PATCH 2/2] xcode12 pre-actions cause error at swift package resolve by some env values --- .../xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme b/SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme index f6c3d7348..783241ee7 100644 --- a/SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme +++ b/SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme @@ -10,7 +10,7 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "cd ${PROJECT_DIR}; env -i PATH=/usr/bin swift package resolve; ruby fix-carthage-paths.rb SwiftGRPC-Carthage.xcodeproj ">