Skip to content

Commit eceb362

Browse files
sundance2000sundance2000
authored
Merge pull request #16 from QuantumApplications/develop
 Fixed Carthage settings
2 parents 968e132 + ef1b311 commit eceb362

File tree

5 files changed

+19
-48
lines changed

5 files changed

+19
-48
lines changed

‎QLog.xcworkspace/contents.xcworkspacedata‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎QLog/QLog.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@
532532
buildConfigurationList = 9FE85A0F1EFAA73700560920 /* Build configuration list for PBXNativeTarget "QLog" */;
533533
buildPhases = (
534534
9F0325AF1F731560008F2BEE /* ShellScript */,
535-
9F6B9605228F57F8006433F0 /* Run Script */,
536535
9FE859F61EFAA73600560920 /* Sources */,
537536
9FE859F71EFAA73600560920 /* Frameworks */,
538537
9FE859F81EFAA73600560920 /* Headers */,
@@ -673,26 +672,6 @@
673672
shellPath = /bin/sh;
674673
shellScript = "if which swiftlint >/dev/null; then\n cd QLogTests\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
675674
};
676-
9F6B9605228F57F8006433F0 /* Run Script */ = {
677-
isa = PBXShellScriptBuildPhase;
678-
buildActionMask = 2147483647;
679-
files = (
680-
);
681-
inputFileListPaths = (
682-
);
683-
inputPaths = (
684-
"$(SRCROOT)/../Carthage/Build/iOS/Zip.framework",
685-
);
686-
name = "Run Script";
687-
outputFileListPaths = (
688-
);
689-
outputPaths = (
690-
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Zip.framework",
691-
);
692-
runOnlyForDeploymentPostprocessing = 0;
693-
shellPath = /bin/sh;
694-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
695-
};
696675
9FA687472055DA0700CD877D /* ShellScript */ = {
697676
isa = PBXShellScriptBuildPhase;
698677
buildActionMask = 2147483647;
@@ -895,6 +874,7 @@
895874
DEBUG_INFORMATION_FORMAT = dwarf;
896875
ENABLE_STRICT_OBJC_MSGSEND = YES;
897876
ENABLE_TESTABILITY = YES;
877+
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/iOS";
898878
GCC_C_LANGUAGE_STANDARD = gnu99;
899879
GCC_DYNAMIC_NO_PIC = NO;
900880
GCC_NO_COMMON_BLOCKS = YES;
@@ -957,6 +937,7 @@
957937
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
958938
ENABLE_NS_ASSERTIONS = NO;
959939
ENABLE_STRICT_OBJC_MSGSEND = YES;
940+
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/iOS";
960941
GCC_C_LANGUAGE_STANDARD = gnu99;
961942
GCC_NO_COMMON_BLOCKS = YES;
962943
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -985,10 +966,6 @@
985966
DYLIB_COMPATIBILITY_VERSION = 1;
986967
DYLIB_CURRENT_VERSION = 1;
987968
DYLIB_INSTALL_NAME_BASE = "@rpath";
988-
FRAMEWORK_SEARCH_PATHS = (
989-
"$(inherited)",
990-
"$(PROJECT_DIR)/../Carthage/Build/iOS",
991-
);
992969
INFOPLIST_FILE = "$(SRCROOT)/QLog/Info.plist";
993970
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
994971
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -1008,10 +985,6 @@
1008985
DYLIB_COMPATIBILITY_VERSION = 1;
1009986
DYLIB_CURRENT_VERSION = 1;
1010987
DYLIB_INSTALL_NAME_BASE = "@rpath";
1011-
FRAMEWORK_SEARCH_PATHS = (
1012-
"$(inherited)",
1013-
"$(PROJECT_DIR)/../Carthage/Build/iOS",
1014-
);
1015988
INFOPLIST_FILE = "$(SRCROOT)/QLog/Info.plist";
1016989
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1017990
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -1027,10 +1000,6 @@
10271000
buildSettings = {
10281001
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
10291002
DEVELOPMENT_TEAM = "";
1030-
FRAMEWORK_SEARCH_PATHS = (
1031-
"$(inherited)",
1032-
"$(PROJECT_DIR)/../Carthage/Build/iOS",
1033-
);
10341003
INFOPLIST_FILE = QLogTests/Info.plist;
10351004
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10361005
PRODUCT_BUNDLE_IDENTIFIER = qa.quantum.QLogTests;
@@ -1044,10 +1013,6 @@
10441013
buildSettings = {
10451014
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
10461015
DEVELOPMENT_TEAM = "";
1047-
FRAMEWORK_SEARCH_PATHS = (
1048-
"$(inherited)",
1049-
"$(PROJECT_DIR)/../Carthage/Build/iOS",
1050-
);
10511016
INFOPLIST_FILE = QLogTests/Info.plist;
10521017
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10531018
PRODUCT_BUNDLE_IDENTIFIER = qa.quantum.QLogTests;

‎QLog/QLog/.swiftlint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ disabled_rules:
33
- force_cast
44
- identifier_name
55
opt_in_rules:
6-
- file_header
76
- cyclomatic_complexity
7+
- file_header
88

99
file_header:
1010
required_pattern: |
@@ -18,6 +18,6 @@ file_header:
1818
file_length:
1919
warning: 500
2020
error: 1200
21-
function_body_length: 15
2221
cyclomatic_complexity: 5
22+
function_body_length: 15
2323
function_parameter_count: 2

‎QLog/QLogTests/GeneratedMocks.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MARK: - Mocks generated from file: QLog/AppsTableViewController.swift at 2019-06-09 21:27:47 +0000
1+
// MARK: - Mocks generated from file: QLog/AppsTableViewController.swift at 2019-06-12 18:03:46 +0000
22

33
//
44
// AppsTableViewController.swift
@@ -492,7 +492,7 @@ import UIKit
492492
}
493493

494494

495-
// MARK: - Mocks generated from file: QLog/LiveLogCoordinator.swift at 2019-06-09 21:27:47 +0000
495+
// MARK: - Mocks generated from file: QLog/LiveLogCoordinator.swift at 2019-06-12 18:03:46 +0000
496496

497497
//
498498
// LiveLogCoordinator.swift
@@ -628,7 +628,7 @@ import MobileCoreServices
628628
}
629629

630630

631-
// MARK: - Mocks generated from file: QLog/LiveLogViewController.swift at 2019-06-09 21:27:47 +0000
631+
// MARK: - Mocks generated from file: QLog/LiveLogViewController.swift at 2019-06-12 18:03:46 +0000
632632

633633
//
634634
// LiveLogViewController.swift
@@ -1268,7 +1268,7 @@ import UIKit
12681268
}
12691269

12701270

1271-
// MARK: - Mocks generated from file: QLog/Logger.swift at 2019-06-09 21:27:47 +0000
1271+
// MARK: - Mocks generated from file: QLog/Logger.swift at 2019-06-12 18:03:46 +0000
12721272

12731273
//
12741274
// Logger.swift
@@ -1420,7 +1420,7 @@ public class LoggerStub: Logger {
14201420
}
14211421

14221422

1423-
// MARK: - Mocks generated from file: QLog/QLog.swift at 2019-06-09 21:27:47 +0000
1423+
// MARK: - Mocks generated from file: QLog/QLog.swift at 2019-06-12 18:03:46 +0000
14241424

14251425
//
14261426
// QLog.swift
@@ -1496,7 +1496,7 @@ public class QLogStub: QLog {
14961496
}
14971497

14981498

1499-
// MARK: - Mocks generated from file: QLog/SupportPackageViewController.swift at 2019-06-09 21:27:47 +0000
1499+
// MARK: - Mocks generated from file: QLog/SupportPackageViewController.swift at 2019-06-12 18:03:46 +0000
15001500

15011501
//
15021502
// SupportPackageViewController.swift
@@ -1840,7 +1840,7 @@ import UIKit
18401840
}
18411841

18421842

1843-
// MARK: - Mocks generated from file: QLog/XcodeLogger.swift at 2019-06-09 21:27:47 +0000
1843+
// MARK: - Mocks generated from file: QLog/XcodeLogger.swift at 2019-06-12 18:03:46 +0000
18441844

18451845
//
18461846
// XcodeLogger.swift

‎QLogExample/QLogExample.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
isa = PBXNativeTarget;
119119
buildConfigurationList = 9F6AAAB12017E20100DB49A0 /* Build configuration list for PBXNativeTarget "QLogExample" */;
120120
buildPhases = (
121+
9F2087BF21F2850A00427BE3 /* ShellScript */,
121122
9F6AAA9B2017E20100DB49A0 /* Sources */,
122123
9F6AAA9C2017E20100DB49A0 /* Frameworks */,
123124
9F6AAA9D2017E20100DB49A0 /* Resources */,
124-
9F2087BF21F2850A00427BE3 /* ShellScript */,
125125
9F923FB522AD9E9E00750F60 /* Embed Frameworks */,
126126
);
127127
buildRules = (
@@ -198,7 +198,7 @@
198198
);
199199
runOnlyForDeploymentPostprocessing = 0;
200200
shellPath = /bin/sh;
201-
shellScript = "if which swiftlint >/dev/null; then\ncd QLogExample\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
201+
shellScript = "if which swiftlint >/dev/null; then\n cd QLogExample\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
202202
};
203203
/* End PBXShellScriptBuildPhase section */
204204

0 commit comments

Comments
 (0)