Skip to content

Commit

Permalink
Merge pull request #3 from RishatShamsutdinov/master
Browse files Browse the repository at this point in the history
Support non-Swift projects - Thank you Rishat
  • Loading branch information
NSProgrammer authored Jun 15, 2016
2 parents 5b13b6b + 8c41b21 commit 254ba9f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Classes/TLSLog.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
#ifndef __TLSLOG_H__
#define __TLSLOG_H__

#ifdef __cplusplus
#import <Foundation/Foundation.h>
#else
@import Foundation;
#endif

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 4 additions & 0 deletions Classes/TLS_Project.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

/* This header is private to Twitter Logging Service */

#ifdef __cplusplus
#import <Foundation/Foundation.h>
#else
@import Foundation;
#endif

/*
Static Asserts (asserts that trigger at compile time)
Expand Down
4 changes: 4 additions & 0 deletions Classes/TwitterLoggingService.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifdef __cplusplus
#import <Foundation/Foundation.h>
#else
@import Foundation;
#endif

#pragma mark Primary Header

Expand Down
15 changes: 12 additions & 3 deletions TwitterLoggingService.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'TwitterLoggingService'
s.version = '2.2.0'
s.version = '2.2.1'
s.summary = 'Twitter Logging Service is a robust and performant logging framework for iOS clients'
s.description = <<-DESC
Twitter created a framework for logging in order to fulfill the following requirements:
Expand All @@ -18,6 +18,15 @@ Twitter created a framework for logging in order to fulfill the following requir
s.author = { 'Twitter' => '[email protected]' }
s.source = { :git => 'https://github.com/twitter/ios-twitter-logging-service.git', :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.source_files = 'Classes/*'
s.public_header_files = 'Classes/*.h'
s.public_header_files = 'Classes/**/*.h'

s.subspec 'Default' do |sp|
sp.source_files = 'Classes/**/*'
end

s.subspec 'ObjC' do |sp|
sp.source_files = 'Classes/**/*.{h,m,c,cpp,mm}'
end

s.default_subspec = 'Default'
end

0 comments on commit 254ba9f

Please sign in to comment.