Skip to content

Commit

Permalink
0.0.2
Browse files Browse the repository at this point in the history 
Update Swift 4
  • Loading branch information
@cemolcay
cemolcay committed Jun 26, 2018
1 parent cb7cb37 commit ac67cd1
Show file tree
Hide file tree
Showing 11 changed files with 221 additions and 154 deletions.
143 changes: 87 additions & 56 deletions Example/Example.xcodeproj/project.pbxproj
View file
Expand Up @@ -178,7 +178,6 @@
B219CBE61E4CF7E30060A6B6 /* Frameworks */,
B219CBE71E4CF7E30060A6B6 /* Resources */,
612B9F31EF392BAAA09BB781 /* [CP] Embed Pods Frameworks */,
0AC41616056C3592CAB226A1 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -198,7 +197,6 @@
B29CBF3C1E41150800297BB1 /* Frameworks */,
B29CBF3D1E41150800297BB1 /* Resources */,
6ED9D18A9178ED3A3268FE83 /* [CP] Embed Pods Frameworks */,
2F8BD43995CD5CEAC8751707 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -218,7 +216,6 @@
B29CBF5D1E41152B00297BB1 /* Frameworks */,
B29CBF5E1E41152B00297BB1 /* Resources */,
EE7025CD2942D03CCBD2B051 /* [CP] Embed Pods Frameworks */,
CF48ACFF062A6F5F82F60E13 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -236,7 +233,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0940;
TargetAttributes = {
B219CBE81E4CF7E30060A6B6 = {
CreatedOnToolsVersion = 8.2.1;
Expand All @@ -251,6 +248,7 @@
B29CBF5F1E41152B00297BB1 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 77Y3N48SNF;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -307,45 +305,20 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0AC41616056C3592CAB226A1 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TV/Pods-TV-resources.sh\"\n";
showEnvVarsInLog = 0;
};
2F8BD43995CD5CEAC8751707 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Mac/Pods-Mac-resources.sh\"\n";
showEnvVarsInLog = 0;
};
612B9F31EF392BAAA09BB781 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-TV/Pods-TV-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/MusicTheorySwift-tvOS/MusicTheorySwift.framework",
"${BUILT_PRODUCTS_DIR}/PianoView-tvOS/PianoView.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MusicTheorySwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PianoView.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -358,9 +331,14 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Mac/Pods-Mac-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/MusicTheorySwift-macOS/MusicTheorySwift.framework",
"${BUILT_PRODUCTS_DIR}/PianoView-macOS/PianoView.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MusicTheorySwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PianoView.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -373,13 +351,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Mac-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
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;
};
C655CFAF2F9E848FF45BB50A /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -388,13 +369,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-iOS-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
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;
};
C699013332007A5514CF5AB4 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -403,28 +387,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-TV-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
CF48ACFF062A6F5F82F60E13 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS/Pods-iOS-resources.sh\"\n";
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;
};
EE7025CD2942D03CCBD2B051 /* [CP] Embed Pods Frameworks */ = {
Expand All @@ -433,9 +405,14 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-iOS/Pods-iOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/MusicTheorySwift-iOS/MusicTheorySwift.framework",
"${BUILT_PRODUCTS_DIR}/PianoView-iOS/PianoView.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MusicTheorySwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PianoView.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -622,12 +599,64 @@
B29CBF391E4114FF00297BB1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
};
B29CBF3A1E4114FF00297BB1 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
};
name = Release;
};
Expand Down Expand Up @@ -677,7 +706,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Mac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = co.prototapp.Mac;
Expand Down Expand Up @@ -729,7 +758,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Mac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = co.prototapp.Mac;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -792,7 +821,8 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -842,7 +872,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down
8 changes: 8 additions & 0 deletions Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Example/Mac/ViewController.swift
View file
Expand Up @@ -25,7 +25,7 @@ class ViewController: NSViewController {
//let notes = NoteType.all.map({ Note(type: $0, octave: 0) })
//let randomNote = notes[Int(arc4random_uniform(UInt32(notes.count)))]
pianoView?.deselectAll()
pianoView?.selectNote(note: Note(type: .dFlat, octave: 0))
pianoView?.selectNote(note: Pitch(key: Key(type: .d, accidental: .flat), octave: 0))
}

override func keyUp(with event: NSEvent) {
Expand Down
12 changes: 8 additions & 4 deletions Example/Podfile.lock
View file
@@ -1,19 +1,23 @@
PODS:
- MusicTheorySwift (0.0.3)
- MusicTheorySwift (1.0.0)
- PianoView (0.0.1):
- MusicTheorySwift

DEPENDENCIES:
- PianoView (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- MusicTheorySwift

EXTERNAL SOURCES:
PianoView:
:path: "../"

SPEC CHECKSUMS:
MusicTheorySwift: 8003df1bf5a905120629378712156ceebebfc7d5
PianoView: a1bdfca224033b01ae83defd918cd0a3804e4bee
MusicTheorySwift: 2102218ba959c04204f376d02f7719fe5f4cfb98
PianoView: 4a8fbad8dfabbfd7d066b4b23d32318b4b036a39

PODFILE CHECKSUM: 53bc2ac8bc82eef033ea854dcf8f06c6d24d81d5

COCOAPODS: 1.2.0
COCOAPODS: 1.5.3
4 changes: 2 additions & 2 deletions Example/iOS/Base.lproj/Main.storyboard
View file
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down
8 changes: 0 additions & 8 deletions Example/iOS/ViewController.swift
View file
Expand Up @@ -12,13 +12,5 @@ import MusicTheorySwift

class ViewController: UIViewController {
@IBOutlet weak var pianoView: PianoView?

override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
super.touchesBegan(touches, with: event)
let notes = NoteType.all.map({ Note(type: $0, octave: 0) })
let randomNote = notes[Int(arc4random_uniform(UInt32(notes.count)))]
pianoView?.deselectAll()
pianoView?.selectNote(note: randomNote)
}
}

4 changes: 2 additions & 2 deletions PianoView.podspec
View file
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "PianoView"
s.version = "0.0.1"
s.version = "0.0.2"
s.summary = "Fully custumisable piano keyboard view with `@IBDesignable` properties in swift."
s.description = <<-DESC
PianoView
Expand All @@ -29,7 +29,7 @@ Fully custumisable piano keyboard view with `@IBDesignable` properties in swift.
Requirements
----
* Swift 3+
* Swift 4+
* iOS 8.0+
* tvOS 9.0+
* macOS 10.9+
Expand Down

0 comments on commit ac67cd1

Please sign in to comment.