Skip to content

Commit

Permalink
Fixes #25
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Blau committed Dec 30, 2016
1 parent 757c5b8 commit 5999297
Show file tree
Hide file tree
Showing 9 changed files with 171 additions and 67 deletions.
87 changes: 81 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,41 @@
# OS X
.DS_Store

# Created by https://www.gitignore.io/api/osx,swift

### OSX ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk


### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -11,11 +44,53 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
profile
xcuserdata/

## Other
*.moved-aside
DerivedData
*.xcuserstate

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# End of https://www.gitignore.io/api/osx,swift
7 changes: 5 additions & 2 deletions ExampleSwift/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
use_frameworks!

pod "COSTouchVisualizer", :path => "../COSTouchVisualizer.podspec"
target 'TouchVisualizer' do
use_frameworks!
pod "COSTouchVisualizer", :path => "../COSTouchVisualizer.podspec"

end
8 changes: 5 additions & 3 deletions ExampleSwift/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ DEPENDENCIES:

EXTERNAL SOURCES:
COSTouchVisualizer:
:path: ../COSTouchVisualizer.podspec
:path: "../COSTouchVisualizer.podspec"

SPEC CHECKSUMS:
COSTouchVisualizer: a398089327a6c02897823614d7447ccc97198997
COSTouchVisualizer: 248b8645474a13d7698dd0223dc593051bf715c9

COCOAPODS: 0.36.3
PODFILE CHECKSUM: 562a1d56fdbb1c3ffe7f33d733b00986362d22c3

COCOAPODS: 1.1.1
67 changes: 44 additions & 23 deletions ExampleSwift/TouchVisualizer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
48B6F48B525A1218DB1C0B37 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 692C5A73FFA5073B9F8A428A /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
E367FB6E6C95861F08193CDD /* Pods_TouchVisualizer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 722C6B75F43A050C04DC95BE /* Pods_TouchVisualizer.framework */; };
EDE2852D1B0AD212003CE61C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE2852C1B0AD212003CE61C /* AppDelegate.swift */; };
EDE2852F1B0AD212003CE61C /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE2852E1B0AD212003CE61C /* MasterViewController.swift */; };
EDE285311B0AD212003CE61C /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE285301B0AD212003CE61C /* DetailViewController.swift */; };
Expand All @@ -28,9 +28,10 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1F1FC1F0F44BD641E4A32D49 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
2083F4F7F0D125488876BD65 /* Pods-TouchVisualizer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchVisualizer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TouchVisualizer/Pods-TouchVisualizer.debug.xcconfig"; sourceTree = "<group>"; };
692C5A73FFA5073B9F8A428A /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7170F01F6808414657FBFC43 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
722C6B75F43A050C04DC95BE /* Pods_TouchVisualizer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TouchVisualizer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
889BE90D3C110891ABA6720E /* Pods-TouchVisualizer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchVisualizer.release.xcconfig"; path = "Pods/Target Support Files/Pods-TouchVisualizer/Pods-TouchVisualizer.release.xcconfig"; sourceTree = "<group>"; };
EDE285271B0AD212003CE61C /* TouchVisualizer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TouchVisualizer.app; sourceTree = BUILT_PRODUCTS_DIR; };
EDE2852B1B0AD212003CE61C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EDE2852C1B0AD212003CE61C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -49,7 +50,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48B6F48B525A1218DB1C0B37 /* Pods.framework in Frameworks */,
E367FB6E6C95861F08193CDD /* Pods_TouchVisualizer.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,11 +64,11 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
411328E27CB9CBA13F7D2E51 /* Pods */ = {
0270693985C161FC7D9CD410 /* Pods */ = {
isa = PBXGroup;
children = (
1F1FC1F0F44BD641E4A32D49 /* Pods.debug.xcconfig */,
7170F01F6808414657FBFC43 /* Pods.release.xcconfig */,
2083F4F7F0D125488876BD65 /* Pods-TouchVisualizer.debug.xcconfig */,
889BE90D3C110891ABA6720E /* Pods-TouchVisualizer.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -76,6 +77,7 @@
isa = PBXGroup;
children = (
692C5A73FFA5073B9F8A428A /* Pods.framework */,
722C6B75F43A050C04DC95BE /* Pods_TouchVisualizer.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -86,8 +88,8 @@
EDE285291B0AD212003CE61C /* TouchVisualizer */,
EDE285411B0AD212003CE61C /* TouchVisualizerTests */,
EDE285281B0AD212003CE61C /* Products */,
411328E27CB9CBA13F7D2E51 /* Pods */,
81A7636BA9229631986F594A /* Frameworks */,
0270693985C161FC7D9CD410 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -146,12 +148,12 @@
isa = PBXNativeTarget;
buildConfigurationList = EDE285481B0AD212003CE61C /* Build configuration list for PBXNativeTarget "TouchVisualizer" */;
buildPhases = (
38DAE73D13D18D0F98015BA6 /* Check Pods Manifest.lock */,
5D936C3EE9A79ADB16541756 /* [CP] Check Pods Manifest.lock */,
EDE285231B0AD212003CE61C /* Sources */,
EDE285241B0AD212003CE61C /* Frameworks */,
EDE285251B0AD212003CE61C /* Resources */,
A0C7744E6D17892D5A1933BF /* Copy Pods Resources */,
8860C933B1544A1B9F6B6908 /* Embed Pods Frameworks */,
6A6C8F5202B9B365F96AEAED /* [CP] Embed Pods Frameworks */,
4449974F51F5CC2B2C1767C3 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -186,14 +188,17 @@
EDE2851F1B0AD212003CE61C /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = Conopsys;
TargetAttributes = {
EDE285261B0AD212003CE61C = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = K78G42H4U2;
LastSwiftMigration = 0820;
};
EDE2853D1B0AD212003CE61C = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0820;
TestTargetID = EDE285261B0AD212003CE61C;
};
};
Expand Down Expand Up @@ -238,49 +243,49 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
38DAE73D13D18D0F98015BA6 /* Check Pods Manifest.lock */ = {
4449974F51F5CC2B2C1767C3 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TouchVisualizer/Pods-TouchVisualizer-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8860C933B1544A1B9F6B6908 /* Embed Pods Frameworks */ = {
5D936C3EE9A79ADB16541756 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
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;
};
A0C7744E6D17892D5A1933BF /* Copy Pods Resources */ = {
6A6C8F5202B9B365F96AEAED /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TouchVisualizer/Pods-TouchVisualizer-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -347,14 +352,17 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -391,8 +399,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -411,29 +421,36 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
EDE285491B0AD212003CE61C /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1F1FC1F0F44BD641E4A32D49 /* Pods.debug.xcconfig */;
baseConfigurationReference = 2083F4F7F0D125488876BD65 /* Pods-TouchVisualizer.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = K78G42H4U2;
INFOPLIST_FILE = TouchVisualizer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.conopsys.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
EDE2854A1B0AD212003CE61C /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7170F01F6808414657FBFC43 /* Pods.release.xcconfig */;
baseConfigurationReference = 889BE90D3C110891ABA6720E /* Pods-TouchVisualizer.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = K78G42H4U2;
INFOPLIST_FILE = TouchVisualizer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.conopsys.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -451,7 +468,9 @@
);
INFOPLIST_FILE = TouchVisualizerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.conopsys.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TouchVisualizer.app/TouchVisualizer";
};
name = Debug;
Expand All @@ -466,7 +485,9 @@
);
INFOPLIST_FILE = TouchVisualizerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.conopsys.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TouchVisualizer.app/TouchVisualizer";
};
name = Release;
Expand Down
Loading

0 comments on commit 5999297

Please sign in to comment.