Skip to content

Modernize: ARC, Favor Properties, Carthage support #22

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

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ TestApp/build
*.mode1v3
*.pbxuser
xcuserdata
.DS_Store
.DS_Store
TestApp.xccheckout
Example2/Example2.xcodeproj/project.xcworkspace/xcshareddata
Example1/Example1.xcodeproj/project.xcworkspace/xcshareddata
595 changes: 595 additions & 0 deletions FsprgEmbeddedStore.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"E3159BE2A0AA0438B45583734574FC90102D82D0" : 0,
"ECD9FA0CCDC4DEE088D281486C1095F3D525E37F" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B768050C-9603-4641-B8E2-7C1CCD4FF558",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"E3159BE2A0AA0438B45583734574FC90102D82D0" : "..",
"ECD9FA0CCDC4DEE088D281486C1095F3D525E37F" : "FsprgEmbeddedStore\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "FsprgEmbeddedStore",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "FsprgEmbeddedStore.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/bitbucket.org\/edovia\/screens-3-for-mac.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E3159BE2A0AA0438B45583734574FC90102D82D0"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Edovia\/FsprgEmbeddedStoreMac.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "ECD9FA0CCDC4DEE088D281486C1095F3D525E37F"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DABC89EC1D3E913200B2FA05"
BuildableName = "FsprgEmbeddedStore.framework"
BlueprintName = "FsprgEmbeddedStore"
ReferencedContainer = "container:FsprgEmbeddedStore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</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 = "DABC89EC1D3E913200B2FA05"
BuildableName = "FsprgEmbeddedStore.framework"
BlueprintName = "FsprgEmbeddedStore"
ReferencedContainer = "container:FsprgEmbeddedStore.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DABC89EC1D3E913200B2FA05"
BuildableName = "FsprgEmbeddedStore.framework"
BlueprintName = "FsprgEmbeddedStore"
ReferencedContainer = "container:FsprgEmbeddedStore.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
28 changes: 18 additions & 10 deletions FsprgEmbeddedStore/FsprgEmbeddedStore.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,25 @@
// FsprgEmbeddedStore.h
// FsprgEmbeddedStore
//
// Created by Lars Steiger on 2/28/10.
// Copyright 2010 FastSpring. All rights reserved.
// Created by Luc Vandal on 2016-07-19.
// Copyright © 2016 Edovia Inc. All rights reserved.
//

#import "FsprgEmbeddedStoreController.h"
#import "FsprgEmbeddedStoreDelegate.h"
#import "FsprgStoreParameters.h"
#import <Cocoa/Cocoa.h>

//! Project version number for FsprgEmbeddedStore.
FOUNDATION_EXPORT double FsprgEmbeddedStoreVersionNumber;

//! Project version string for FsprgEmbeddedStore.
FOUNDATION_EXPORT const unsigned char FsprgEmbeddedStoreVersionString[];

#import <FsprgEmbeddedStore/FsprgEmbeddedStoreController.h>
#import <FsprgEmbeddedStore/FsprgEmbeddedStoreDelegate.h>
#import <FsprgEmbeddedStore/FsprgStoreParameters.h>

// Model
#import "FsprgOrder.h"
#import "FsprgOrderItem.h"
#import "FsprgFulfillment.h"
#import "FsprgLicense.h"
#import "FsprgFileDownload.h"
#import <FsprgEmbeddedStore/FsprgOrder.h>
#import <FsprgEmbeddedStore/FsprgOrderItem.h>
#import <FsprgEmbeddedStore/FsprgFulfillment.h>
#import <FsprgEmbeddedStore/FsprgLicense.h>
#import <FsprgEmbeddedStore/FsprgFileDownload.h>
28 changes: 28 additions & 0 deletions FsprgEmbeddedStore/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 © 2016 Edovia Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
34 changes: 0 additions & 34 deletions FsprgEmbeddedStore/Model/FsprgLicense.h

This file was deleted.

45 changes: 0 additions & 45 deletions FsprgEmbeddedStore/Model/FsprgOrder.h

This file was deleted.

60 changes: 0 additions & 60 deletions FsprgEmbeddedStore/Model/FsprgOrderItem.h

This file was deleted.

5 changes: 4 additions & 1 deletion README.mdown
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Introduction #

[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CocoaPods](https://img.shields.io/cocoapods/dt/FsprgEmbeddedStoreMac.svg)](http://cocoapods.org/pods/FsprgEmbeddedStoreMac)

[FastSpring](http://www.fastspring.com) offers an innovative e-commerce engine designed to overcome ease of use, customer service, and cost issues that have plagued software e-commerce companies.

FastSpring's embedded store consists of a controller with some integration points and WebKit's web view. It's thin and very flexible and lets you integrate FastSpring the way that fits best for your application.
Expand Down Expand Up @@ -48,7 +51,7 @@ In addition, it has some integration points defined by the `FsprgEmbeddedStoreDe

## How-to embed it ##

Use our [CocoaPod](http://cocoapods.org/?q=fsprgembeddedstoremac) or perform the following steps.
Use our [CocoaPod](http://cocoapods.org/pods/FsprgEmbeddedStoreMac), Carthage, or perform the following steps.

1. [Clone or fork](http://help.github.com/fork-a-repo) our repository.
2. Open your project in Xcode.
Expand Down
Loading