Created
March 15, 2018 23:01
-
-
Save paulb777/ed910f1500ca15bde6f1150c47b8905a to your computer and use it in GitHub Desktop.
Fixes to Mixed Objective C and Swift static_framework test for https://github.com/CocoaPods/CocoaPods/issues/7307
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppOCObject.m b/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppOCObject.m | |
index 527aa12..23f5628 100644 | |
--- a/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppOCObject.m | |
+++ b/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppOCObject.m | |
@@ -26,7 +26,7 @@ | |
// pod files | |
// TODO: | |
- // NSLog(@"%s %d %@", __PRETTY_FUNCTION__, __LINE__, [SwiftObject new]); | |
+ NSLog(@"%s %d %@", __PRETTY_FUNCTION__, __LINE__, [SwiftObject new]); | |
NSLog(@"%s %d %@", __PRETTY_FUNCTION__, __LINE__, [OCObject new]); | |
} | |
diff --git a/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppSwiftObject.swift b/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppSwiftObject.swift | |
index 691748e..7e92dcc 100644 | |
--- a/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppSwiftObject.swift | |
+++ b/Example/SwiftOCMixedPodWithLibAndFrameworkDependencies/AppSwiftObject.swift | |
@@ -27,7 +27,7 @@ class AppSwiftObject { | |
// pod files | |
debugPrint("\(type(of: self)).\(#function) \(#line) ", SwiftObject()) | |
// TODO: | |
- // debugPrint("\(type(of: self)).\(#function) \(#line) ", OCObject()) | |
+ debugPrint("\(type(of: self)).\(#function) \(#line) ", AppOCObject()) | |
} | |
} | |
diff --git a/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/OCObject.m b/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/OCObject.m | |
index 1617fcb..2ff90e9 100644 | |
--- a/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/OCObject.m | |
+++ b/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/OCObject.m | |
@@ -9,7 +9,7 @@ | |
@import Fabric; | |
@import Crashlytics; | |
#import "MiPushSDK.h" | |
-#import "SwiftOCMixedPodWithLibAndFrameworkDependencies-Swift.h" | |
+#import <SwiftOCMixedPodWithLibAndFrameworkDependencies/SwiftOCMixedPodWithLibAndFrameworkDependencies-Swift.h> | |
@implementation OCObject | |
diff --git a/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/SwiftObject.swift b/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/SwiftObject.swift | |
index ce43776..ac9cc12 100644 | |
--- a/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/SwiftObject.swift | |
+++ b/SwiftOCMixedPodWithLibAndFrameworkDependencies/Classes/SwiftObject.swift | |
@@ -9,7 +9,6 @@ import Foundation | |
import Fabric | |
import Crashlytics | |
- | |
@objc public class SwiftObject: NSObject { | |
@objc public func hi() { | |
@@ -25,7 +24,7 @@ import Crashlytics | |
// Objective-C class in this pod | |
// TODO: | |
- // debugPrint("\(type(of: self)).\(#function) \(#line) ", OCObject()) | |
+ debugPrint("\(type(of: self)).\(#function) \(#line) ", OCObject()) | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
in SwiftObject.swift MiPushSDK can not use