Skip to content

Commit

Permalink
Rework xcodeproj and workspace to build Frameworks instead of static …
Browse files Browse the repository at this point in the history
…libraries
  • Loading branch information
Alex Billingsley committed Feb 23, 2016
1 parent 4dac846 commit e5ce186
Show file tree
Hide file tree
Showing 26 changed files with 566 additions and 1,706 deletions.
45 changes: 0 additions & 45 deletions CHANGES.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<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>BNDL</string>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>2.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 DyKnow LLC. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
29 changes: 23 additions & 6 deletions SignalR.Client/SignalR.h → Framework/SignalR.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,37 @@
// Created by Alex Billingsley on 11/8/11.
// Copyright (c) 2011 DyKnow LLC. (http://dyknow.com/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of
// the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//

#import <Foundation/Foundation.h>

//! Project version number for SignalR-ObjC
FOUNDATION_EXPORT double SignalRVersionNumber;

//! Project version string for SignalR-ObjC
FOUNDATION_EXPORT const unsigned char SignalRVersionNumberString[];

#import <Availability.h>
#import <TargetConditionals.h>

#ifndef _SignalR_
#define _SignalR_

#import "SRConnection.h"
#import "SRHubs.h"


#endif /* _SignalR_ */
5 changes: 5 additions & 0 deletions Framework/module.modulemap
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
framework module SignalR {
umbrella header "SignalR.h"
export *
module * { export * }
}
48 changes: 20 additions & 28 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
xcodeproj 'SignalR.Client.ObjC/SignalR.Client.ObjC'
workspace 'SignalR.Client.ObjC'

target :"SignalR.Client.iOS", :exclusive => true do
platform :ios, '7.0'
pod 'AFNetworking', '2.6.3'
pod 'SocketRocket', '0.4.2'
target "SignalR.Client.iOS" do
use_frameworks!
platform :ios, '8.0'

pod 'AFNetworking', '2.6.3'
pod 'SocketRocket', '0.4.2'

target "SignalR.Client.iOSTests" do
pod 'OCMock'
end
end

target :"SignalR.Client.OSX", :exclusive => true do
platform :osx, '10.9'
pod 'AFNetworking', '2.6.3'
pod 'SocketRocket', '0.4.2'
end

target :"SignalR.Client.Tests.OSX", :exclusive => true do
target :"SignalR.Client.OSX" do
use_frameworks!
platform :osx, '10.9'
pod 'OCMock'
end

target :"SignalR.Client.Tests.iOS", :exclusive => true do
platform :ios, '7.0'
pod 'OCMock'
end


target :"SignalR.Samples.iOS", :exclusive => true do
platform :ios, '7.0'
end


target :"SignalR.Samples.OSX", :exclusive => true do
platform :osx, '10.9'
end

pod 'AFNetworking', '2.6.3'
pod 'SocketRocket', '0.4.2'

target :"SignalR.Client.OSXTests" do
pod 'OCMock'
end
end
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PODS:
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- OCMock (2.2.2)
- OCMock (3.2.2)
- SocketRocket (0.4.2)

DEPENDENCIES:
Expand All @@ -30,7 +30,7 @@ DEPENDENCIES:

SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
OCMock: c8b8928d457c8f1873d563537ab1cc31bef40b87
OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad

COCOAPODS: 0.39.0
4 changes: 2 additions & 2 deletions SignalR-ObjC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Pod::Spec.new do |s|
s.homepage = "https://github.com/DyKnow/SignalR-ObjC"
s.license = 'MIT'
s.author = { "Alex Billingsley" => "[email protected]" }
s.source = { :git => 'https://github.com/DyKnow/SignalR-ObjC.git', :tag => '2.0.1' }
s.ios.deployment_target = '7.0'
s.source = { :git => 'https://github.com/DyKnow/SignalR-ObjC.git', :tag => '2.0.0.beta5' }
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.requires_arc = true

Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions SignalR.Client.ObjC/SignalR.Client.OSX/SignalR_Client_OSX.h

This file was deleted.

13 changes: 0 additions & 13 deletions SignalR.Client.ObjC/SignalR.Client.OSX/SignalR_Client_OSX.m

This file was deleted.

Loading

0 comments on commit e5ce186

Please sign in to comment.