From 275a9043e6495b57c9cbd08277e05760bfee11dd Mon Sep 17 00:00:00 2001 From: Dave Wood Date: Tue, 23 Aug 2016 03:40:24 -0400 Subject: [PATCH] Clean up/improve testing, fix Travis script --- .travis.yml | 52 ++++- .../OSXDemo/OSXDemo.xcodeproj/project.pbxproj | 30 +++ .../xcshareddata/xcschemes/OSXDemo.xcscheme | 115 ++++++++++ .../DemoApps/OSX/OSXDemo/OSXDemo/Info.plist | 4 +- .../OSX/OSXDemo/OSXDemoTests/Info.plist | 4 +- .../iOSDemo/iOSDemo.xcodeproj/project.pbxproj | 30 +++ .../xcshareddata/xcschemes/iOSDemo.xcscheme | 4 +- .../DemoApps/iOS/iOSDemo/iOSDemo/Info.plist | 4 +- .../iOS/iOSDemo/iOSDemoTests/Info.plist | 4 +- .../iOSDemo/watchOSDemo Extension/Info.plist | 4 +- .../iOS/iOSDemo/watchOSDemo/Info.plist | 4 +- .../tvOSDemo.xcodeproj/project.pbxproj | 30 +++ .../xcshareddata/xcschemes/tvOSDemo.xcscheme | 101 +++++++++ .../tvOS/tvOSDemo/tvOSDemo/Info.plist | 4 +- .../tvOS/tvOSDemo/tvOSDemoTests/Info.plist | 4 +- .../XCGLogger.xcodeproj/project.pbxproj | 206 +++++++++++++++++- .../xcschemes/XCGLogger (tvOS).xcscheme | 33 +++ .../xcschemes/XCGLogger (watchOS).xcscheme | 37 +++- .../Library/XCGLogger/OSX/Info-OSX.plist | 4 +- .../Library/XCGLogger/iOS/Info-iOS.plist | 4 +- .../Library/XCGLogger/tvOS/Info-tvOS.plist | 4 +- XCGLogger/Library/XCGLoggerTests/Info.plist | 2 +- .../XCGLoggerTests/XCGLoggerTests.swift | 2 +- 23 files changed, 643 insertions(+), 43 deletions(-) create mode 100644 XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/xcshareddata/xcschemes/OSXDemo.xcscheme create mode 100644 XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/xcshareddata/xcschemes/tvOSDemo.xcscheme diff --git a/.travis.yml b/.travis.yml index 8b611a5f..13114f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,51 @@ language: objective-c -xcode_project: XCGLogger/Library/XCGLogger.xcodeproj -xcode_scheme: XCGLogger (iOS) osx_image: xcode7.3 -xcode_sdk: iphonesimulator9.3 +env: + global: + - LC_CTYPE=en_US.UTF-8 + - LANG=en_US.UTF-8 + - LIB_PROJECT=XCGLogger/Library/XCGLogger.xcodeproj + - IOSDEMO_PROJECT=XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj + - OSXDEMO_PROJECT=XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj + - TVOSDEMO_PROJECT=XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj + - IOS_FRAMEWORK_SCHEME="XCGLogger (iOS)" + - OSX_FRAMEWORK_SCHEME="XCGLogger (OS X)" + - TVOS_FRAMEWORK_SCHEME="XCGLogger (tvOS)" + - WATCHOS_FRAMEWORK_SCHEME="XCGLogger (watchOS)" + - IOS_SDK=iphonesimulator9.3 + - OSX_SDK=macosx10.11 + - TVOS_SDK=appletvsimulator9.2 + - WATCHOS_SDK=watchsimulator2.2 + - IOS_EXAMPLE_SCHEME="iOSDemo" + - OSX_EXAMPLE_SCHEME="OSXDemo" + - TVOS_EXAMPLE_SCHEME="tvOSDemo" + matrix: + - POD_LINT="YES" + - PROJECT_FILE="$LIB_PROJECT" DESTINATION="OS=9.3,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean test build" + - PROJECT_FILE="$LIB_PROJECT" DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK" POD_LINT="NO" BUILDCMD="clean test build" + - PROJECT_FILE="$LIB_PROJECT" DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" POD_LINT="NO" BUILDCMD="clean test build" + - PROJECT_FILE="$LIB_PROJECT" DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=8.1,name=iPhone 5" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=8.2,name=iPhone 5S" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=8.3,name=iPhone 6" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=8.4,name=iPad Retina" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=9.0,name=iPhone 6 Plus" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=9.1,name=iPhone 6S" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=9.2,name=iPhone 6S Plus" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$IOSDEMO_PROJECT" DESTINATION="OS=9.3,name=iPad Retina" SCHEME="$IOS_EXAMPLE_SCHEME" SDK="$IOS_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$OSXDEMO_PROJECT" DESTINATION="arch=x86_64" SCHEME="$OSX_EXAMPLE_SCHEME" SDK="$OSX_SDK" POD_LINT="NO" BUILDCMD="clean build" + - PROJECT_FILE="$TVOSDEMO_PROJECT" DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="$TVOS_EXAMPLE_SCHEME" SDK="$TVOS_SDK" POD_LINT="NO" BUILDCMD="clean build" before_install: -- brew uninstall xctool && brew install --HEAD xctool + - brew update +script: + - set -o pipefail + - xcodebuild -version + - xcodebuild -showsdks + + - if [ $POD_LINT == "YES" ]; then pod lib lint; fi + - if [ $POD_LINT == "NO" ]; then xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD | xcpretty -c; fi + - if [ $POD_LINT == "NO" ]; then xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD | xcpretty -c; fi + + # Can't specify the SDK or the watchOS builds will fail with: target specifies product type 'com.apple.product-type.watchkit2-extension', but there's no such product type for the 'iphonesimulator' platform + # - xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD; + # - xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD; diff --git a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/project.pbxproj b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/project.pbxproj index 296237a2..bf49f23d 100644 --- a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/project.pbxproj +++ b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/project.pbxproj @@ -79,6 +79,20 @@ remoteGlobalIDString = 554DF41619D76FE7005708BE; remoteInfo = "XCGLogger (OS X)"; }; + 55E328541D6C33BF008CCB8A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 555FFCCE19D77B3400F62246 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB851D6BAC61006A9C7A; + remoteInfo = "XCGLoggerTests (watchOS)"; + }; + 55E328561D6C33BF008CCB8A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 555FFCCE19D77B3400F62246 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB921D6BAC66006A9C7A; + remoteInfo = "XCGLoggerTests (tvOS)"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -198,6 +212,8 @@ 55CB2FB51BA12ADE0031F329 /* XCGLogger.framework */, 555FFCD919D77B3400F62246 /* XCGLoggerTests (iOS).xctest */, 5562CA971B7B25DD00F36DD8 /* XCGLoggerTests (OS X).xctest */, + 55E328551D6C33BF008CCB8A /* XCGLoggerTests (watchOS).xctest */, + 55E328571D6C33BF008CCB8A /* XCGLoggerTests (tvOS).xctest */, ); name = Products; sourceTree = ""; @@ -330,6 +346,20 @@ remoteRef = 55CB2FB41BA12ADE0031F329 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 55E328551D6C33BF008CCB8A /* XCGLoggerTests (watchOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (watchOS).xctest"; + remoteRef = 55E328541D6C33BF008CCB8A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 55E328571D6C33BF008CCB8A /* XCGLoggerTests (tvOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (tvOS).xctest"; + remoteRef = 55E328561D6C33BF008CCB8A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/xcshareddata/xcschemes/OSXDemo.xcscheme b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/xcshareddata/xcschemes/OSXDemo.xcscheme new file mode 100644 index 00000000..6ddcbb44 --- /dev/null +++ b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo.xcodeproj/xcshareddata/xcschemes/OSXDemo.xcscheme @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo/Info.plist b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo/Info.plist index b4370302..d857ce41 100644 --- a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo/Info.plist +++ b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemo/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4 + ${CURRENT_PROJECT_VERSION} CFBundleSignature ???? CFBundleVersion - 7 + 1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemoTests/Info.plist b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemoTests/Info.plist index 1b7b10af..c356c9d9 100644 --- a/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemoTests/Info.plist +++ b/XCGLogger/DemoApps/OSX/OSXDemo/OSXDemoTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.4 + ${CURRENT_PROJECT_VERSION} CFBundleSignature ???? CFBundleVersion - 7 + 1 diff --git a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/project.pbxproj b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/project.pbxproj index 9a1291b6..c84e9219 100644 --- a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/project.pbxproj +++ b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/project.pbxproj @@ -36,6 +36,20 @@ remoteGlobalIDString = 55E3EE4419D76F280068C3A7; remoteInfo = "XCGLogger (iOS)"; }; + 55419D621D6BF3D1007ED193 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 558C64A819D777B100D6D507 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB851D6BAC61006A9C7A; + remoteInfo = "XCGLoggerTests (watchOS)"; + }; + 55419D641D6BF3D1007ED193 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 558C64A819D777B100D6D507 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB921D6BAC66006A9C7A; + remoteInfo = "XCGLoggerTests (tvOS)"; + }; 558C649819D7770100D6D507 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 558C647A19D7770100D6D507 /* Project object */; @@ -293,6 +307,8 @@ 55CB2FBC1BA12B4E0031F329 /* XCGLogger.framework */, 558C64B319D777B100D6D507 /* XCGLoggerTests (iOS).xctest */, 55D4395B1B7AAC16001370EC /* XCGLoggerTests (OS X).xctest */, + 55419D631D6BF3D1007ED193 /* XCGLoggerTests (watchOS).xctest */, + 55419D651D6BF3D1007ED193 /* XCGLoggerTests (tvOS).xctest */, ); name = Products; sourceTree = ""; @@ -462,6 +478,20 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 55419D631D6BF3D1007ED193 /* XCGLoggerTests (watchOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (watchOS).xctest"; + remoteRef = 55419D621D6BF3D1007ED193 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 55419D651D6BF3D1007ED193 /* XCGLoggerTests (tvOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (tvOS).xctest"; + remoteRef = 55419D641D6BF3D1007ED193 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 558C64AF19D777B100D6D507 /* XCGLogger.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme index 24c0c827..6ce7b54b 100644 --- a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme +++ b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme @@ -22,10 +22,10 @@ + buildForAnalyzing = "NO"> CFBundlePackageType APPL CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + 1 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemoTests/Info.plist b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemoTests/Info.plist index 1b7b10af..c356c9d9 100644 --- a/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemoTests/Info.plist +++ b/XCGLogger/DemoApps/iOS/iOSDemo/iOSDemoTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.4 + ${CURRENT_PROJECT_VERSION} CFBundleSignature ???? CFBundleVersion - 7 + 1 diff --git a/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo Extension/Info.plist b/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo Extension/Info.plist index 1a94d066..c0d95a48 100644 --- a/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo Extension/Info.plist +++ b/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo Extension/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + 1 NSExtension NSExtensionAttributes diff --git a/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo/Info.plist b/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo/Info.plist index d390ef32..2d3021c5 100644 --- a/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo/Info.plist +++ b/XCGLogger/DemoApps/iOS/iOSDemo/watchOSDemo/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + 1 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj index f57a26dd..91fd4a2c 100644 --- a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj +++ b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj @@ -17,6 +17,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 55419D6E1D6BF44F007ED193 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 557C47C21BA1207500C9A174 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB851D6BAC61006A9C7A; + remoteInfo = "XCGLoggerTests (watchOS)"; + }; + 55419D701D6BF44F007ED193 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 557C47C21BA1207500C9A174 /* XCGLogger.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 558EEB921D6BAC66006A9C7A; + remoteInfo = "XCGLoggerTests (tvOS)"; + }; 557C47CB1BA1207500C9A174 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 557C47C21BA1207500C9A174 /* XCGLogger.xcodeproj */; @@ -138,6 +152,8 @@ 557C47D21BA1207500C9A174 /* XCGLogger.framework */, 557C47D41BA1207500C9A174 /* XCGLoggerTests (iOS).xctest */, 557C47D61BA1207500C9A174 /* XCGLoggerTests (OS X).xctest */, + 55419D6F1D6BF44F007ED193 /* XCGLoggerTests (watchOS).xctest */, + 55419D711D6BF44F007ED193 /* XCGLoggerTests (tvOS).xctest */, ); name = Products; sourceTree = ""; @@ -267,6 +283,20 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 55419D6F1D6BF44F007ED193 /* XCGLoggerTests (watchOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (watchOS).xctest"; + remoteRef = 55419D6E1D6BF44F007ED193 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 55419D711D6BF44F007ED193 /* XCGLoggerTests (tvOS).xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "XCGLoggerTests (tvOS).xctest"; + remoteRef = 55419D701D6BF44F007ED193 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 557C47CC1BA1207500C9A174 /* XCGLogger.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/xcshareddata/xcschemes/tvOSDemo.xcscheme b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/xcshareddata/xcschemes/tvOSDemo.xcscheme new file mode 100644 index 00000000..9fd263a2 --- /dev/null +++ b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo.xcodeproj/xcshareddata/xcschemes/tvOSDemo.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo/Info.plist b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo/Info.plist index 0791d963..c85d3fc6 100644 --- a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo/Info.plist +++ b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemo/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + 1 LSRequiresIPhoneOS UIMainStoryboardFile diff --git a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemoTests/Info.plist b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemoTests/Info.plist index 1b7b10af..73216d3c 100644 --- a/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemoTests/Info.plist +++ b/XCGLogger/DemoApps/tvOS/tvOSDemo/tvOSDemoTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + 1 diff --git a/XCGLogger/Library/XCGLogger.xcodeproj/project.pbxproj b/XCGLogger/Library/XCGLogger.xcodeproj/project.pbxproj index 8eccef4d..8b0e4093 100644 --- a/XCGLogger/Library/XCGLogger.xcodeproj/project.pbxproj +++ b/XCGLogger/Library/XCGLogger.xcodeproj/project.pbxproj @@ -10,6 +10,10 @@ 554DF41019D76FA9005708BE /* XCGLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 554DF40F19D76FA9005708BE /* XCGLogger.swift */; }; 554DF43319D77155005708BE /* XCGLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 554DF40F19D76FA9005708BE /* XCGLogger.swift */; }; 557C47E41BA125F800C9A174 /* XCGLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 554DF40F19D76FA9005708BE /* XCGLogger.swift */; }; + 558EEB7E1D6BAC61006A9C7A /* XCGLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3EE5719D76F280068C3A7 /* XCGLoggerTests.swift */; }; + 558EEB801D6BAC61006A9C7A /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55E3EE4519D76F280068C3A7 /* XCGLogger.framework */; }; + 558EEB8B1D6BAC66006A9C7A /* XCGLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3EE5719D76F280068C3A7 /* XCGLoggerTests.swift */; }; + 558EEB8D1D6BAC66006A9C7A /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55E3EE4519D76F280068C3A7 /* XCGLogger.framework */; }; 55BB1EFA1B79DC7500709779 /* XCGLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3EE5719D76F280068C3A7 /* XCGLoggerTests.swift */; }; 55BB1EFC1B79DC7500709779 /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55E3EE4519D76F280068C3A7 /* XCGLogger.framework */; }; 55DA396819D7737B0032F026 /* XCGLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 55DA396519D7737B0032F026 /* XCGLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -22,12 +26,26 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 55BB1EF71B79DC7500709779 /* PBXContainerItemProxy */ = { + 550F31521D6C270E00919165 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 55E3EE3C19D76F280068C3A7 /* Project object */; proxyType = 1; - remoteGlobalIDString = 55E3EE4419D76F280068C3A7; - remoteInfo = XCGLogger; + remoteGlobalIDString = 554DF41619D76FE7005708BE; + remoteInfo = "XCGLogger (OS X)"; + }; + 550F31541D6C271600919165 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 55E3EE3C19D76F280068C3A7 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 70CB94161B99E728007802FF; + remoteInfo = "XCGLogger (watchOS)"; + }; + 550F31561D6C271F00919165 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 55E3EE3C19D76F280068C3A7 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5515A3DE1BA119FA0047BA31; + remoteInfo = "XCGLogger (tvOS)"; }; 55E3EE5219D76F280068C3A7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -42,6 +60,8 @@ 5515A3DF1BA119FA0047BA31 /* XCGLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = XCGLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 554DF40F19D76FA9005708BE /* XCGLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCGLogger.swift; sourceTree = ""; }; 554DF41719D76FE7005708BE /* XCGLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = XCGLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 558EEB851D6BAC61006A9C7A /* XCGLoggerTests (watchOS).xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "XCGLoggerTests (watchOS).xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 558EEB921D6BAC66006A9C7A /* XCGLoggerTests (tvOS).xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "XCGLoggerTests (tvOS).xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 55BB1F011B79DC7500709779 /* XCGLoggerTests (OS X).xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "XCGLoggerTests (OS X).xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 55DA396519D7737B0032F026 /* XCGLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCGLogger.h; sourceTree = ""; }; 55DA396719D7737B0032F026 /* XCGLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCGLogger.h; sourceTree = ""; }; @@ -71,6 +91,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 558EEB7F1D6BAC61006A9C7A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 558EEB801D6BAC61006A9C7A /* XCGLogger.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 558EEB8C1D6BAC66006A9C7A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 558EEB8D1D6BAC66006A9C7A /* XCGLogger.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 55BB1EFB1B79DC7500709779 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -148,7 +184,9 @@ 554DF41719D76FE7005708BE /* XCGLogger.framework */, 55BB1F011B79DC7500709779 /* XCGLoggerTests (OS X).xctest */, 70CB94201B99E728007802FF /* XCGLogger.framework */, + 558EEB851D6BAC61006A9C7A /* XCGLoggerTests (watchOS).xctest */, 5515A3DF1BA119FA0047BA31 /* XCGLogger.framework */, + 558EEB921D6BAC66006A9C7A /* XCGLoggerTests (tvOS).xctest */, ); name = Products; sourceTree = ""; @@ -263,6 +301,42 @@ productReference = 554DF41719D76FE7005708BE /* XCGLogger.framework */; productType = "com.apple.product-type.framework"; }; + 558EEB7A1D6BAC61006A9C7A /* XCGLoggerTests (watchOS) */ = { + isa = PBXNativeTarget; + buildConfigurationList = 558EEB821D6BAC61006A9C7A /* Build configuration list for PBXNativeTarget "XCGLoggerTests (watchOS)" */; + buildPhases = ( + 558EEB7D1D6BAC61006A9C7A /* Sources */, + 558EEB7F1D6BAC61006A9C7A /* Frameworks */, + 558EEB811D6BAC61006A9C7A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 550F31551D6C271600919165 /* PBXTargetDependency */, + ); + name = "XCGLoggerTests (watchOS)"; + productName = XCGLoggerTests; + productReference = 558EEB851D6BAC61006A9C7A /* XCGLoggerTests (watchOS).xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 558EEB871D6BAC66006A9C7A /* XCGLoggerTests (tvOS) */ = { + isa = PBXNativeTarget; + buildConfigurationList = 558EEB8F1D6BAC66006A9C7A /* Build configuration list for PBXNativeTarget "XCGLoggerTests (tvOS)" */; + buildPhases = ( + 558EEB8A1D6BAC66006A9C7A /* Sources */, + 558EEB8C1D6BAC66006A9C7A /* Frameworks */, + 558EEB8E1D6BAC66006A9C7A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 550F31571D6C271F00919165 /* PBXTargetDependency */, + ); + name = "XCGLoggerTests (tvOS)"; + productName = XCGLoggerTests; + productReference = 558EEB921D6BAC66006A9C7A /* XCGLoggerTests (tvOS).xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 55BB1EF51B79DC7500709779 /* XCGLoggerTests (OS X) */ = { isa = PBXNativeTarget; buildConfigurationList = 55BB1EFE1B79DC7500709779 /* Build configuration list for PBXNativeTarget "XCGLoggerTests (OS X)" */; @@ -274,7 +348,7 @@ buildRules = ( ); dependencies = ( - 55BB1EF61B79DC7500709779 /* PBXTargetDependency */, + 550F31531D6C270E00919165 /* PBXTargetDependency */, ); name = "XCGLoggerTests (OS X)"; productName = XCGLoggerTests; @@ -378,6 +452,8 @@ 5515A3DE1BA119FA0047BA31 /* XCGLogger (tvOS) */, 55E3EE4F19D76F280068C3A7 /* XCGLoggerTests (iOS) */, 55BB1EF51B79DC7500709779 /* XCGLoggerTests (OS X) */, + 558EEB7A1D6BAC61006A9C7A /* XCGLoggerTests (watchOS) */, + 558EEB871D6BAC66006A9C7A /* XCGLoggerTests (tvOS) */, ); }; /* End PBXProject section */ @@ -397,6 +473,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 558EEB811D6BAC61006A9C7A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 558EEB8E1D6BAC66006A9C7A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 55BB1EFD1B79DC7500709779 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -444,6 +534,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 558EEB7D1D6BAC61006A9C7A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 558EEB7E1D6BAC61006A9C7A /* XCGLoggerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 558EEB8A1D6BAC66006A9C7A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 558EEB8B1D6BAC66006A9C7A /* XCGLoggerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 55BB1EF81B79DC7500709779 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -479,10 +585,20 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 55BB1EF61B79DC7500709779 /* PBXTargetDependency */ = { + 550F31531D6C270E00919165 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 55E3EE4419D76F280068C3A7 /* XCGLogger (iOS) */; - targetProxy = 55BB1EF71B79DC7500709779 /* PBXContainerItemProxy */; + target = 554DF41619D76FE7005708BE /* XCGLogger (OS X) */; + targetProxy = 550F31521D6C270E00919165 /* PBXContainerItemProxy */; + }; + 550F31551D6C271600919165 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 70CB94161B99E728007802FF /* XCGLogger (watchOS) */; + targetProxy = 550F31541D6C271600919165 /* PBXContainerItemProxy */; + }; + 550F31571D6C271F00919165 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5515A3DE1BA119FA0047BA31 /* XCGLogger (tvOS) */; + targetProxy = 550F31561D6C271F00919165 /* PBXContainerItemProxy */; }; 55E3EE5319D76F280068C3A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -577,6 +693,58 @@ }; name = Release; }; + 558EEB831D6BAC61006A9C7A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = "$(SRCROOT)/XCGLoggerTests/Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.cerebralgardens.xcglogger.tests; + PRODUCT_MODULE_NAME = XCGLoggerTests_iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = watchos; + }; + name = Debug; + }; + 558EEB841D6BAC61006A9C7A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "$(SRCROOT)/XCGLoggerTests/Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.cerebralgardens.xcglogger.tests; + PRODUCT_MODULE_NAME = XCGLoggerTests_iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = watchos; + }; + name = Release; + }; + 558EEB901D6BAC66006A9C7A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = "$(SRCROOT)/XCGLoggerTests/Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.cerebralgardens.xcglogger.tests; + PRODUCT_MODULE_NAME = XCGLoggerTests_iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + }; + name = Debug; + }; + 558EEB911D6BAC66006A9C7A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "$(SRCROOT)/XCGLoggerTests/Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.cerebralgardens.xcglogger.tests; + PRODUCT_MODULE_NAME = XCGLoggerTests_iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + }; + name = Release; + }; 55BB1EFF1B79DC7500709779 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -623,7 +791,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 3.4; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -643,7 +810,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "${inherited} @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "${inherited} @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_MODULE_NAME = XCGLogger; @@ -674,7 +841,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 3.4; ENABLE_NS_ASSERTIONS = NO; @@ -687,7 +853,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "${inherited} @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "${inherited} @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_MODULE_NAME = XCGLogger; SDKROOT = iphoneos; @@ -827,6 +993,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 558EEB821D6BAC61006A9C7A /* Build configuration list for PBXNativeTarget "XCGLoggerTests (watchOS)" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 558EEB831D6BAC61006A9C7A /* Debug */, + 558EEB841D6BAC61006A9C7A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 558EEB8F1D6BAC66006A9C7A /* Build configuration list for PBXNativeTarget "XCGLoggerTests (tvOS)" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 558EEB901D6BAC66006A9C7A /* Debug */, + 558EEB911D6BAC66006A9C7A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 55BB1EFE1B79DC7500709779 /* Build configuration list for PBXNativeTarget "XCGLoggerTests (OS X)" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (tvOS).xcscheme b/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (tvOS).xcscheme index 1af929fe..fda5feb4 100644 --- a/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (tvOS).xcscheme +++ b/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (tvOS).xcscheme @@ -20,6 +20,20 @@ ReferencedContainer = "container:XCGLogger.xcodeproj"> + + + + + + + + + + + + diff --git a/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (watchOS).xcscheme b/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (watchOS).xcscheme index 90937a15..16721f35 100644 --- a/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (watchOS).xcscheme +++ b/XCGLogger/Library/XCGLogger.xcodeproj/xcshareddata/xcschemes/XCGLogger (watchOS).xcscheme @@ -20,6 +20,20 @@ ReferencedContainer = "container:XCGLogger.xcodeproj"> + + + + + + + + @@ -69,6 +93,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/XCGLogger/Library/XCGLogger/OSX/Info-OSX.plist b/XCGLogger/Library/XCGLogger/OSX/Info-OSX.plist index c7a313b5..b733c262 100644 --- a/XCGLogger/Library/XCGLogger/OSX/Info-OSX.plist +++ b/XCGLogger/Library/XCGLogger/OSX/Info-OSX.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1 NSHumanReadableCopyright Copyright © 2014 Cerebral Gardens. All rights reserved. NSPrincipalClass diff --git a/XCGLogger/Library/XCGLogger/iOS/Info-iOS.plist b/XCGLogger/Library/XCGLogger/iOS/Info-iOS.plist index c7a313b5..b733c262 100644 --- a/XCGLogger/Library/XCGLogger/iOS/Info-iOS.plist +++ b/XCGLogger/Library/XCGLogger/iOS/Info-iOS.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1 NSHumanReadableCopyright Copyright © 2014 Cerebral Gardens. All rights reserved. NSPrincipalClass diff --git a/XCGLogger/Library/XCGLogger/tvOS/Info-tvOS.plist b/XCGLogger/Library/XCGLogger/tvOS/Info-tvOS.plist index f0550e5c..ca3d4efe 100644 --- a/XCGLogger/Library/XCGLogger/tvOS/Info-tvOS.plist +++ b/XCGLogger/Library/XCGLogger/tvOS/Info-tvOS.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1 NSHumanReadableCopyright Copyright © 2014 Cerebral Gardens. All rights reserved. NSPrincipalClass diff --git a/XCGLogger/Library/XCGLoggerTests/Info.plist b/XCGLogger/Library/XCGLoggerTests/Info.plist index 293abfe9..b0d4f922 100644 --- a/XCGLogger/Library/XCGLoggerTests/Info.plist +++ b/XCGLogger/Library/XCGLoggerTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.4 + $(CURRENT_PROJECT_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/XCGLogger/Library/XCGLoggerTests/XCGLoggerTests.swift b/XCGLogger/Library/XCGLoggerTests/XCGLoggerTests.swift index dcbe84f1..47fc68ed 100644 --- a/XCGLogger/Library/XCGLoggerTests/XCGLoggerTests.swift +++ b/XCGLogger/Library/XCGLoggerTests/XCGLoggerTests.swift @@ -7,7 +7,7 @@ // import XCTest -import XCGLogger +@testable import XCGLogger class XCGLoggerTests: XCTestCase {