diff options
| author | Paul Beusterien <paulbeusterien@google.com> | 2020-08-07 12:38:52 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2020-08-08 08:20:25 +0300 |
| commit | 39a4693a32c3a0a2ce7ff96a5a9b51fc239e1a2b (patch) | |
| tree | d29c6da69f3508702165815c4dc3c55e3a37f4e7 /spm-test | |
| parent | d528514e459c040c1ee5f6f8b49e5489ad07e5be (diff) | |
More seamless SwiftPM implementation (#567)
This update allows clients to share common syntax for nanopb imports/includes between CocoaPods and Swift Package Manager.
See example at firebase/firebase-ios-sdk#6165
Diffstat (limited to 'spm-test')
| -rw-r--r-- | spm-test/objc/c-header.c | 4 | ||||
| -rw-r--r-- | spm-test/objc/objc-header.m | 4 | ||||
| -rw-r--r-- | spm-test/objc/objc-qualified.m | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/spm-test/objc/c-header.c b/spm-test/objc/c-header.c index 2995860..17d6795 100644 --- a/spm-test/objc/c-header.c +++ b/spm-test/objc/c-header.c @@ -1 +1,3 @@ -#include "nanopb.h" +#include "pb.h" +#include "pb_common.h" +#include "pb_decode.h" diff --git a/spm-test/objc/objc-header.m b/spm-test/objc/objc-header.m index d8f79cf..860f42b 100644 --- a/spm-test/objc/objc-header.m +++ b/spm-test/objc/objc-header.m @@ -1 +1,3 @@ -#import "nanopb.h" +#import "pb.h" +#import <pb_common.h> +#include "pb_decode.h" diff --git a/spm-test/objc/objc-qualified.m b/spm-test/objc/objc-qualified.m new file mode 100644 index 0000000..ada0ba1 --- /dev/null +++ b/spm-test/objc/objc-qualified.m @@ -0,0 +1,3 @@ +#import "nanopb/pb.h" +#import <nanopb/pb_common.h> +#include "nanopb/pb_decode.h" |