Skip to content
This repository was archived by the owner on Oct 30, 2024. It is now read-only.

Commit 8770357

Browse files
authored
Merge pull request #1 from medley-inc/ysugigami/remove-copy-framwork-run-script-causing-nested-framework
Remove copy framwork run script causing nested framework
2 parents 2fba9eb + 84aae94 commit 8770357

File tree

5 files changed

+11
-71
lines changed

5 files changed

+11
-71
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ matrix:
1717
env: FASTLANE_ENV=tvos11_xcode9
1818
- osx_image: xcode9.2
1919
env: FASTLANE_ENV=osx
20-
- osx_image: xcode8.3
21-
env: FASTLANE_ENV=ios10_xcode8
22-
- osx_image: xcode7.3
23-
env: FASTLANE_ENV=ios9_xcode7
24-
- osx_image: xcode7.3
25-
env: FASTLANE_ENV=ios8_xcode7
2620
before_install:
2721
# Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617
2822
- gem uninstall bundler -v '>1.12.5' --force --executables || echo "bundler >1.12.5 is not installed"

AFNetworkActivityLogger.xcodeproj/project.pbxproj

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@
345345
29D77A9E1BCC49C9005B1EF5 /* Frameworks */,
346346
29D77A9F1BCC49C9005B1EF5 /* Headers */,
347347
29D77AA01BCC49C9005B1EF5 /* Resources */,
348-
29D77AAD1BCC4A12005B1EF5 /* ShellScript */,
349348
);
350349
buildRules = (
351350
);
@@ -365,7 +364,6 @@
365364
29D77AB21BCC4BDD005B1EF5 /* Headers */,
366365
29D77AB31BCC4BDD005B1EF5 /* Resources */,
367366
29D77AC01BCC4C7F005B1EF5 /* CopyFiles */,
368-
29D77AC31BCC4C96005B1EF5 /* ShellScript */,
369367
);
370368
buildRules = (
371369
);
@@ -384,7 +382,6 @@
384382
29D77AC51BCC4D4D005B1EF5 /* Frameworks */,
385383
29D77AC61BCC4D4D005B1EF5 /* Headers */,
386384
29D77AC71BCC4D4D005B1EF5 /* Resources */,
387-
29D77AD71BCC4DC5005B1EF5 /* ShellScript */,
388385
);
389386
buildRules = (
390387
);
@@ -403,7 +400,6 @@
403400
29D96E611BCC34CD00F571A5 /* Frameworks */,
404401
29D96E621BCC34CD00F571A5 /* Headers */,
405402
29D96E631BCC34CD00F571A5 /* Resources */,
406-
29D96E771BCC36E700F571A5 /* ShellScript */,
407403
);
408404
buildRules = (
409405
);
@@ -489,6 +485,7 @@
489485
developmentRegion = English;
490486
hasScannedForEncodings = 0;
491487
knownRegions = (
488+
English,
492489
en,
493490
);
494491
mainGroup = 29D96E5B1BCC34CD00F571A5;
@@ -559,65 +556,6 @@
559556
};
560557
/* End PBXResourcesBuildPhase section */
561558

562-
/* Begin PBXShellScriptBuildPhase section */
563-
29D77AAD1BCC4A12005B1EF5 /* ShellScript */ = {
564-
isa = PBXShellScriptBuildPhase;
565-
buildActionMask = 2147483647;
566-
files = (
567-
);
568-
inputPaths = (
569-
"$(SRCROOT)/Carthage/Build/Mac/AFNetworking.framework",
570-
);
571-
outputPaths = (
572-
);
573-
runOnlyForDeploymentPostprocessing = 0;
574-
shellPath = /bin/sh;
575-
shellScript = "/usr/local/bin/carthage copy-frameworks";
576-
};
577-
29D77AC31BCC4C96005B1EF5 /* ShellScript */ = {
578-
isa = PBXShellScriptBuildPhase;
579-
buildActionMask = 2147483647;
580-
files = (
581-
);
582-
inputPaths = (
583-
"$(SRCROOT)/Carthage/Build/watchOS/AFNetworking.framework",
584-
);
585-
outputPaths = (
586-
);
587-
runOnlyForDeploymentPostprocessing = 0;
588-
shellPath = /bin/sh;
589-
shellScript = "/usr/local/bin/carthage copy-frameworks";
590-
};
591-
29D77AD71BCC4DC5005B1EF5 /* ShellScript */ = {
592-
isa = PBXShellScriptBuildPhase;
593-
buildActionMask = 2147483647;
594-
files = (
595-
);
596-
inputPaths = (
597-
"$(SRCROOT)/Carthage/Build/tvOS/AFNetworking.framework",
598-
);
599-
outputPaths = (
600-
);
601-
runOnlyForDeploymentPostprocessing = 0;
602-
shellPath = /bin/sh;
603-
shellScript = "/usr/local/bin/carthage copy-frameworks";
604-
};
605-
29D96E771BCC36E700F571A5 /* ShellScript */ = {
606-
isa = PBXShellScriptBuildPhase;
607-
buildActionMask = 2147483647;
608-
files = (
609-
);
610-
inputPaths = (
611-
"$(SRCROOT)/Carthage/Build/iOS/AFNetworking.framework",
612-
);
613-
outputPaths = (
614-
);
615-
runOnlyForDeploymentPostprocessing = 0;
616-
shellPath = /bin/sh;
617-
shellScript = "/usr/local/bin/carthage copy-frameworks";
618-
};
619-
/* End PBXShellScriptBuildPhase section */
620-
621559
/* Begin PBXSourcesBuildPhase section */
622560
297DF57D1C1F1CA2001FA807 /* Sources */ = {
623561
isa = PBXSourcesBuildPhase;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "AFNetworking/AFNetworking" ~> 3.0
1+
github "AFNetworking/AFNetworking" ~> 4.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "AFNetworking/AFNetworking" "3.2.0"
1+
github "AFNetworking/AFNetworking" "4.0.1"

0 commit comments

Comments
 (0)