Skip to content

Commit

Permalink
fix:fix macOS upload
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangteng committed Oct 22, 2018
1 parent 4cf3719 commit f11158b
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 11 deletions.
13 changes: 11 additions & 2 deletions Example/Logan-macOS/Logan-macOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
84C23AB72172343D00588A19 /* clogan.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = clogan.xcodeproj; path = ../../../Logan/clogan.xcodeproj; sourceTree = "<group>"; };
84C23BB12172382B00588A19 /* Logan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logan.h; sourceTree = "<group>"; };
84C23BB22172382B00588A19 /* Logan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logan.m; sourceTree = "<group>"; };
A7E5B822217DC16C0055F2A8 /* Logan-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Logan-macOS.entitlements"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -105,6 +106,7 @@
84C23A97217233F400588A19 /* Logan-macOS */ = {
isa = PBXGroup;
children = (
A7E5B822217DC16C0055F2A8 /* Logan-macOS.entitlements */,
84C23BB02172382B00588A19 /* iOS */,
84C23AB72172343D00588A19 /* clogan.xcodeproj */,
84C23A98217233F400588A19 /* AppDelegate.h */,
Expand Down Expand Up @@ -203,6 +205,11 @@
TargetAttributes = {
84C23A94217233F400588A19 = {
CreatedOnToolsVersion = 10.0;
SystemCapabilities = {
com.apple.Sandbox = {
enabled = 1;
};
};
};
84C23AA7217233F600588A19 = {
CreatedOnToolsVersion = 10.0;
Expand Down Expand Up @@ -440,14 +447,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Logan-macOS/Logan_macOS.entitlements";
CODE_SIGN_ENTITLEMENTS = "Logan-macOS/Logan-macOS.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "Logan-macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.Logan-macOS-Example.Logan-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -457,14 +465,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Logan-macOS/Logan_macOS.entitlements";
CODE_SIGN_ENTITLEMENTS = "Logan-macOS/Logan-macOS.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "Logan-macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.Logan-macOS-Example.Logan-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down
2 changes: 0 additions & 2 deletions Example/Logan-macOS/Logan-macOS/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ @interface AppDelegate ()
@property (weak) IBOutlet NSWindow *window;

@property (nonatomic, assign) int count;
//@property (weak, nonatomic) IBOutlet UITextView *filesInfo;
//@property (weak, nonatomic) IBOutlet UITextField *ipText;
@property (weak) IBOutlet NSTextField *filesInfo;
@property (weak) IBOutlet NSTextField *ipText;

Expand Down
14 changes: 14 additions & 0 deletions Example/Logan-macOS/Logan-macOS/Logan-macOS.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?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>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
</dict>
</plist>
7 changes: 1 addition & 6 deletions Example/Logan-macOS/Logan-macOS/Logan_macOS.entitlements
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?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>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
</dict>
<dict/>
</plist>
2 changes: 1 addition & 1 deletion Logan.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Logan'
s.version = '1.0.0'
s.version = '1.1.1'
s.summary = 'Logan is a lightweight case logging system based on mobile platform.'

s.homepage = 'https://github.com/Meituan-Dianping/Logan'
Expand Down
5 changes: 5 additions & 0 deletions Logan/iOS/Logan.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ @interface Logan : NSObject {
NSTimeInterval _lastCheckFreeSpace;
}
@property (nonatomic, copy) NSString *lastLogDate;

#if OS_OBJECT_USE_OBJC
@property (nonatomic, strong) dispatch_queue_t loganQueue;
#else
@property (nonatomic, assign) dispatch_queue_t loganQueue;
#endif

+ (instancetype)logan;

Expand Down

0 comments on commit f11158b

Please sign in to comment.