Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suggested project fixes/changes #28

Merged
merged 2 commits into from
May 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
osx_image: xcode8
language: objective-c
before_install:
before_install:
- gem install xcpretty slather -N
- xcrun instruments -w "iPhone 5 (9.3)" || echo "(Pre)Launched the simulator."
script:
- set -o pipefail && xcodebuild test -project Down.xcodeproj -scheme "Down-iOS" -destination "platform=iOS Simulator,name=iPhone 5,OS=9.3" -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES | xcpretty -c
- set -o pipefail && xcodebuild -project Down.xcodeproj -scheme "DownTests-macOS" -sdk macosx -destination 'platform=OS X,arch=x86_64' test | xcpretty -c
- set -o pipefail && xcodebuild -project Down.xcodeproj -scheme "Down" -destination "platform=iOS Simulator,name=iPhone 5,OS=9.3" -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES test | xcpretty -c
- set -o pipefail && xcodebuild -project Down.xcodeproj -scheme "Down" -sdk macosx -destination 'platform=OS X,arch=x86_64' -enableCodeCoverage YES test | xcpretty -c
after_success:
- slather coverage --ignore "../**/*/Xcode*" --ignore "Source/cmark/*" --scheme "Down-iOS" Down.xcodeproj
- slather coverage --ignore "../**/*/Xcode*" --ignore "Source/cmark/*" --scheme "Down-macOS" Down.xcodeproj
- slather coverage --ignore "../**/*/Xcode*" --ignore "Source/cmark/*" --scheme "Down" Down.xcodeproj
684 changes: 47 additions & 637 deletions Down.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

99 changes: 0 additions & 99 deletions Down.xcodeproj/xcshareddata/xcschemes/Down-iOS.xcscheme

This file was deleted.

80 changes: 0 additions & 80 deletions Down.xcodeproj/xcshareddata/xcschemes/Down-tvOS.xcscheme

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D4201E891CFA5151008EEC6E"
BlueprintIdentifier = "8AFAEAFA1E6E32E900E09B68"
BuildableName = "DownTests.xctest"
BlueprintName = "DownTests"
ReferencedContainer = "container:Down.xcodeproj">
Expand Down
56 changes: 0 additions & 56 deletions Down.xcodeproj/xcshareddata/xcschemes/DownTests-macOS.xcscheme

This file was deleted.

19 changes: 0 additions & 19 deletions Down/Down.h

This file was deleted.

4 changes: 4 additions & 0 deletions Resources/Configurations/Deployment-Targets.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0
MACOSX_DEPLOYMENT_TARGET = 10.12
TVOS_DEPLOYMENT_TARGET = 9.0
WATCHOS_DEPLOYMENT_TARGET = 3.0
25 changes: 25 additions & 0 deletions Resources/Configurations/Universal-Framework-Target.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#include "Universal-Target-Base.xcconfig"

// OSX-specific default settings
FRAMEWORK_VERSION[sdk=macosx*] = A
COMBINE_HIDPI_IMAGES[sdk=macosx*] = YES

// iOS-specific default settings
TARGETED_DEVICE_FAMILY[sdk=iphonesimulator*] = 1,2
TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2

// TV-specific default settings
TARGETED_DEVICE_FAMILY[sdk=appletvsimulator*] = 3
TARGETED_DEVICE_FAMILY[sdk=appletv*] = 3

// Watch-specific default settings
TARGETED_DEVICE_FAMILY[sdk=watchsimulator*] = 4
TARGETED_DEVICE_FAMILY[sdk=watch*] = 4

ENABLE_BITCODE[sdk=macosx*] = NO
ENABLE_BITCODE[sdk=watchsimulator*] = YES
ENABLE_BITCODE[sdk=watch*] = YES
ENABLE_BITCODE[sdk=iphonesimulator*] = NO
ENABLE_BITCODE[sdk=iphone*] = YES
ENABLE_BITCODE[sdk=appletvsimulator*] = YES
ENABLE_BITCODE[sdk=appletv*] = YES
18 changes: 18 additions & 0 deletions Resources/Configurations/Universal-Target-Base.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos watchos watchsimulator appletvos appletvsimulator
VALID_ARCHS[sdk=macosx*] = i386 x86_64
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
VALID_ARCHS[sdk=watchos*] = armv7k
VALID_ARCHS[sdk=watchsimulator*] = i386
VALID_ARCHS[sdk=appletv*] = arm64
VALID_ARCHS[sdk=appletvsimulator*] = x86_64

// Dynamic linking uses different default copy paths
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=watchos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'

File renamed without changes.
4 changes: 2 additions & 2 deletions Info.plist → Resources/DownTests-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Glazed Donut, LLC. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down