Skip to content

Commit 17cf4f9

Browse files
cemolcaycemolcay
authored
Merge pull request #3 from cemolcay/update
2.0 (14)
2 parents 9684ad6 + ba5153e commit 17cf4f9

File tree

12 files changed

+148
-151
lines changed

12 files changed

+148
-151
lines changed

‎.travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ language: objective-c
33
workspace: ChordDetector.xcworkspace
44
scheme: ChordDetector
55
test_scheme: ChordDetectorTests
6-
osx_image: xcode9
7-
xcode_sdk: macosx10.12
6+
osx_image: xcode10
7+
xcode_sdk: macosx10.14
88

99
before_install:
1010
- gem install cocoapods
1111
- pod repo update
1212

1313
script:
14-
- pod install
15-
- xcodebuild -workspace ChordDetector.xcworkspace -scheme ChordDetector ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
16-
- xcodebuild test -workspace ChordDetector.xcworkspace -scheme ChordDetectorTests ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
14+
- xcodebuild -workspace ChordDetector.xcworkspace -scheme ChordDetector ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=""
15+
- xcodebuild -workspace ChordDetector.xcworkspace -scheme ChordDetectorTests test ONLY_ACTIVE_ARCH=YES CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=""

‎ChordDetector.xcodeproj/project.pbxproj

+19-44
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
B27643A41E8494DB00B67425 /* Frameworks */,
140140
B27643A51E8494DB00B67425 /* Resources */,
141141
2CC3CCCC95854AE99F8E8B3C /* [CP] Embed Pods Frameworks */,
142-
B003C2B5475D05DEE18BA2FE /* [CP] Copy Pods Resources */,
143142
B2C3DA611E85F99900BD3074 /* Crashlytics */,
144143
);
145144
buildRules = (
@@ -160,7 +159,6 @@
160159
B2C64CBF1E8E6A0200E7B74F /* Frameworks */,
161160
B2C64CC01E8E6A0200E7B74F /* Resources */,
162161
DA5A3469DDD57EC2402AAEC9 /* [CP] Embed Pods Frameworks */,
163-
6C5467B394CC7FF835CEFE0B /* [CP] Copy Pods Resources */,
164162
);
165163
buildRules = (
166164
);
@@ -179,12 +177,13 @@
179177
isa = PBXProject;
180178
attributes = {
181179
LastSwiftUpdateCheck = 0830;
182-
LastUpgradeCheck = 0920;
180+
LastUpgradeCheck = 1000;
183181
ORGANIZATIONNAME = cemolcay;
184182
TargetAttributes = {
185183
B27643A61E8494DB00B67425 = {
186184
CreatedOnToolsVersion = 8.2.1;
187185
DevelopmentTeam = 77Y3N48SNF;
186+
LastSwiftMigration = 1000;
188187
ProvisioningStyle = Automatic;
189188
SystemCapabilities = {
190189
com.apple.Sandbox = {
@@ -195,7 +194,7 @@
195194
B2C64CC11E8E6A0200E7B74F = {
196195
CreatedOnToolsVersion = 8.3;
197196
DevelopmentTeam = 77Y3N48SNF;
198-
LastSwiftMigration = 0920;
197+
LastSwiftMigration = 1000;
199198
ProvisioningStyle = Automatic;
200199
TestTargetID = B27643A61E8494DB00B67425;
201200
};
@@ -246,48 +245,20 @@
246245
files = (
247246
);
248247
inputPaths = (
249-
"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetector/Pods-ChordDetector-frameworks.sh",
248+
"${PODS_ROOT}/Target Support Files/Pods-ChordDetector/Pods-ChordDetector-frameworks.sh",
250249
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
251250
"${BUILT_PRODUCTS_DIR}/Kanna/Kanna.framework",
251+
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
252252
);
253253
name = "[CP] Embed Pods Frameworks";
254254
outputPaths = (
255255
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
256256
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kanna.framework",
257+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
257258
);
258259
runOnlyForDeploymentPostprocessing = 0;
259260
shellPath = /bin/sh;
260-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetector/Pods-ChordDetector-frameworks.sh\"\n";
261-
showEnvVarsInLog = 0;
262-
};
263-
6C5467B394CC7FF835CEFE0B /* [CP] Copy Pods Resources */ = {
264-
isa = PBXShellScriptBuildPhase;
265-
buildActionMask = 2147483647;
266-
files = (
267-
);
268-
inputPaths = (
269-
);
270-
name = "[CP] Copy Pods Resources";
271-
outputPaths = (
272-
);
273-
runOnlyForDeploymentPostprocessing = 0;
274-
shellPath = /bin/sh;
275-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetectorTests/Pods-ChordDetectorTests-resources.sh\"\n";
276-
showEnvVarsInLog = 0;
277-
};
278-
B003C2B5475D05DEE18BA2FE /* [CP] Copy Pods Resources */ = {
279-
isa = PBXShellScriptBuildPhase;
280-
buildActionMask = 2147483647;
281-
files = (
282-
);
283-
inputPaths = (
284-
);
285-
name = "[CP] Copy Pods Resources";
286-
outputPaths = (
287-
);
288-
runOnlyForDeploymentPostprocessing = 0;
289-
shellPath = /bin/sh;
290-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetector/Pods-ChordDetector-resources.sh\"\n";
261+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ChordDetector/Pods-ChordDetector-frameworks.sh\"\n";
291262
showEnvVarsInLog = 0;
292263
};
293264
B2C3DA611E85F99900BD3074 /* Crashlytics */ = {
@@ -346,18 +317,20 @@
346317
files = (
347318
);
348319
inputPaths = (
349-
"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetectorTests/Pods-ChordDetectorTests-frameworks.sh",
320+
"${PODS_ROOT}/Target Support Files/Pods-ChordDetectorTests/Pods-ChordDetectorTests-frameworks.sh",
350321
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
351322
"${BUILT_PRODUCTS_DIR}/Kanna/Kanna.framework",
323+
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
352324
);
353325
name = "[CP] Embed Pods Frameworks";
354326
outputPaths = (
355327
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
356328
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kanna.framework",
329+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
357330
);
358331
runOnlyForDeploymentPostprocessing = 0;
359332
shellPath = /bin/sh;
360-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChordDetectorTests/Pods-ChordDetectorTests-frameworks.sh\"\n";
333+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ChordDetectorTests/Pods-ChordDetectorTests-frameworks.sh\"\n";
361334
showEnvVarsInLog = 0;
362335
};
363336
/* End PBXShellScriptBuildPhase section */
@@ -415,13 +388,15 @@
415388
CLANG_WARN_BOOL_CONVERSION = YES;
416389
CLANG_WARN_COMMA = YES;
417390
CLANG_WARN_CONSTANT_CONVERSION = YES;
391+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
418392
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
419393
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
420394
CLANG_WARN_EMPTY_BODY = YES;
421395
CLANG_WARN_ENUM_CONVERSION = YES;
422396
CLANG_WARN_INFINITE_RECURSION = YES;
423397
CLANG_WARN_INT_CONVERSION = YES;
424398
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
399+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
425400
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
426401
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
427402
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -471,13 +446,15 @@
471446
CLANG_WARN_BOOL_CONVERSION = YES;
472447
CLANG_WARN_COMMA = YES;
473448
CLANG_WARN_CONSTANT_CONVERSION = YES;
449+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
474450
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
475451
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
476452
CLANG_WARN_EMPTY_BODY = YES;
477453
CLANG_WARN_ENUM_CONVERSION = YES;
478454
CLANG_WARN_INFINITE_RECURSION = YES;
479455
CLANG_WARN_INT_CONVERSION = YES;
480456
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
457+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
481458
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
482459
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
483460
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -521,7 +498,7 @@
521498
MACOSX_DEPLOYMENT_TARGET = 10.10;
522499
PRODUCT_BUNDLE_IDENTIFIER = com.cemolcay.chordDetector;
523500
PRODUCT_NAME = "Chord Detector";
524-
SWIFT_VERSION = 4.0;
501+
SWIFT_VERSION = 4.2;
525502
};
526503
name = Debug;
527504
};
@@ -539,7 +516,7 @@
539516
MACOSX_DEPLOYMENT_TARGET = 10.10;
540517
PRODUCT_BUNDLE_IDENTIFIER = com.cemolcay.chordDetector;
541518
PRODUCT_NAME = "Chord Detector";
542-
SWIFT_VERSION = 4.0;
519+
SWIFT_VERSION = 4.2;
543520
};
544521
name = Release;
545522
};
@@ -557,8 +534,7 @@
557534
PRODUCT_BUNDLE_IDENTIFIER = com.example.ChordDetectorTests;
558535
PRODUCT_NAME = "$(TARGET_NAME)";
559536
PROVISIONING_PROFILE_SPECIFIER = "";
560-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
561-
SWIFT_VERSION = 4.0;
537+
SWIFT_VERSION = 4.2;
562538
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Chord Detector.app/Contents/MacOS/Chord Detector";
563539
};
564540
name = Debug;
@@ -577,8 +553,7 @@
577553
PRODUCT_BUNDLE_IDENTIFIER = com.example.ChordDetectorTests;
578554
PRODUCT_NAME = "$(TARGET_NAME)";
579555
PROVISIONING_PROFILE_SPECIFIER = "";
580-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
581-
SWIFT_VERSION = 4.0;
556+
SWIFT_VERSION = 4.2;
582557
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Chord Detector.app/Contents/MacOS/Chord Detector";
583558
};
584559
name = Release;

‎ChordDetector.xcodeproj/xcshareddata/xcschemes/ChordDetector.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎ChordDetector.xcodeproj/xcshareddata/xcschemes/ChordDetectorTests.xcscheme

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
language = ""
1413
shouldUseLaunchSchemeArgsEnv = "YES">
1514
<Testables>
1615
<TestableReference
@@ -40,7 +39,6 @@
4039
buildConfiguration = "Debug"
4140
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4241
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4442
launchStyle = "0"
4543
useCustomWorkingDirectory = "NO"
4644
ignoresPersistentStateOnLaunch = "NO"
@@ -66,15 +64,6 @@
6664
savedToolIdentifier = ""
6765
useCustomWorkingDirectory = "NO"
6866
debugDocumentVersioning = "YES">
69-
<MacroExpansion>
70-
<BuildableReference
71-
BuildableIdentifier = "primary"
72-
BlueprintIdentifier = "B27643A61E8494DB00B67425"
73-
BuildableName = "Chord Detector.app"
74-
BlueprintName = "ChordDetector"
75-
ReferencedContainer = "container:ChordDetector.xcodeproj">
76-
</BuildableReference>
77-
</MacroExpansion>
7867
</ProfileAction>
7968
<AnalyzeAction
8069
buildConfiguration = "Debug">

‎ChordDetector.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
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>

‎ChordDetector.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

+8
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>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

‎ChordDetector/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
2020
// StatusBarItem
2121
statusItem.menu = menu
2222
if let button = statusItem.button {
23-
button.image = NSImage(named: NSImage.Name(rawValue: "menuBar"))
23+
button.image = NSImage(named: "menuBar")
2424
button.imageScaling = .scaleProportionallyUpOrDown
2525
}
2626

0 commit comments

Comments
 (0)