Skip to content

Commit

Permalink
Merge branch 'release/framework'
Browse files Browse the repository at this point in the history
  • Loading branch information
ricobeck committed Oct 13, 2015
2 parents b13369b + 3e78653 commit 088d368
Show file tree
Hide file tree
Showing 11 changed files with 365 additions and 118 deletions.
6 changes: 3 additions & 3 deletions Classes/osx/KFAboutWindowController.m
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ - (void)windowDidLoad
self.bundleVersion = info[@"CFBundleVersion"];
self.humanReadableCopyright = info[@"NSHumanReadableCopyright"];

NSString *creditsPath = [[NSBundle mainBundle] pathForResource:@"Credits" ofType:@"rtf"];
NSURL *creditsURL = [[NSBundle mainBundle] URLForResource:@"Credits" withExtension:@"rtf"];

if (creditsPath != nil)
if (creditsURL != nil)
{
self.credits = [[NSAttributedString alloc] initWithPath:creditsPath documentAttributes:nil];
self.credits = [[NSAttributedString alloc] initWithURL:creditsURL options:[NSDictionary new] documentAttributes:nil error:nil];
}

NSString *acknowledgementsPath = [[NSBundle mainBundle] pathForResource:@"Acknowledgements" ofType:@"plist"];
Expand Down
2 changes: 1 addition & 1 deletion Classes/osx/KFAboutWindowStyleModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright (c) 2014 KF Interactive. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>

@interface KFAboutWindowStyleModel : NSObject

Expand Down
2 changes: 1 addition & 1 deletion Classes/osx/NSAttributedString+CocoaPods.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright (c) 2014 KF Interactive. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>

#if TARGET_OS_IPHONE
#define ColorClassName UIColor
Expand Down
28 changes: 28 additions & 0 deletions Project/KFAboutWindow/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?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>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<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 © 2015 KF Interactive. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
21 changes: 21 additions & 0 deletions Project/KFAboutWindow/KFAboutWindow.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// KFAboutWindow.h
// KFAboutWindow
//
// Created by rick on 13/10/15.
// Copyright © 2015 KF Interactive. All rights reserved.
//

#import <Cocoa/Cocoa.h>

//! Project version number for KFAboutWindow.
FOUNDATION_EXPORT double KFAboutWindowVersionNumber;

//! Project version string for KFAboutWindow.
FOUNDATION_EXPORT const unsigned char KFAboutWindowVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <KFAboutWindow/PublicHeader.h>


#import "KFAboutWindowController.h"
#import "KFAboutWindowStyleModel.h"
200 changes: 199 additions & 1 deletion Project/KFAboutWindowPreview.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C8303A5431C9171FF0540949C6B095A170B8DE2B",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"C8303A5431C9171FF0540949C6B095A170B8DE2B" : 0,
"982310E13E76901E4324C124A89637FCC19E0FEE" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "A614F089-24B5-44E9-B1A2-77501E198601",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"C8303A5431C9171FF0540949C6B095A170B8DE2B" : "KFAboutWindow\/",
"982310E13E76901E4324C124A89637FCC19E0FEE" : ".."
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "KFAboutWindowPreview",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Project\/KFAboutWindowPreview.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/85.232.8.233:8022\/ost\/provision-buddy.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "982310E13E76901E4324C124A89637FCC19E0FEE"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ricobeck\/KFAboutWindow.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C8303A5431C9171FF0540949C6B095A170B8DE2B"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D998F5B1BCD90D500D56F27"
BuildableName = "KFAboutWindow.framework"
BlueprintName = "KFAboutWindow"
ReferencedContainer = "container:KFAboutWindowPreview.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D998F5B1BCD90D500D56F27"
BuildableName = "KFAboutWindow.framework"
BlueprintName = "KFAboutWindow"
ReferencedContainer = "container:KFAboutWindowPreview.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D998F5B1BCD90D500D56F27"
BuildableName = "KFAboutWindow.framework"
BlueprintName = "KFAboutWindow"
ReferencedContainer = "container:KFAboutWindowPreview.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.kfinteractive.osx.ui.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.kfinteractive.osx.ui.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down

0 comments on commit 088d368

Please sign in to comment.