Skip to content

Commit ad6f8a6

Browse files
committed
Update folder structure
1 parent 4e604a7 commit ad6f8a6

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

Package.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ let sharedCSettings: [CSetting] = [
3232
.unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
3333
.define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
3434
]
35-
let sharedSwiftSettings: [SwiftSetting] = []
35+
let sharedSwiftSettings: [SwiftSetting] = [
36+
.swiftLanguageMode(.v5),
37+
]
3638

3739
// MARK: - Targets
3840

3941
let openBoxTarget = Target.target(
4042
name: "OpenBox",
41-
publicHeadersPath: ".",
4243
cSettings: sharedCSettings
4344
)
4445
let openBoxShimsTarget = Target.target(
@@ -67,7 +68,7 @@ let openBoxCompatibilityTestTarget = Target.testTarget(
6768
let package = Package(
6869
name: "OpenBox",
6970
products: [
70-
.library(name: "OpenBox", targets: ["OpenBox"]),
71+
.library(name: "OpenBox", type: .dynamic, targets: ["OpenBox"]),
7172
.library(name: "OpenBoxShims", targets: ["OpenBoxShims"]),
7273
],
7374
dependencies: [
@@ -80,7 +81,7 @@ let package = Package(
8081
openBoxTestTarget,
8182
openBoxCompatibilityTestTarget,
8283
],
83-
cxxLanguageStandard: .cxx17
84+
cxxLanguageStandard: .cxx20
8485
)
8586

8687

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@
4848
#include <CoreFoundation/CoreFoundation.h>
4949
#include <stdint.h>
5050
#include <stdbool.h>
51-
#include "OBTargetConditionals.h"
5251
#include "OBSwiftSupport.h"
52+
#include "OBTargetConditionals.h"
5353

5454
#define OB_ENUM CF_ENUM
55+
#define OB_CLOSED_ENUM CF_CLOSED_ENUM
5556
#define OB_OPTIONS CF_OPTIONS
5657
#define OB_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
5758
#define OB_EXTERN_C_END CF_EXTERN_C_END
5859
#define OB_ASSUME_NONNULL_BEGIN CF_ASSUME_NONNULL_BEGIN
5960
#define OB_ASSUME_NONNULL_END CF_ASSUME_NONNULL_END
61+
#define OB_IMPLICIT_BRIDGING_ENABLED CF_IMPLICIT_BRIDGING_ENABLED
62+
#define OB_IMPLICIT_BRIDGING_DISABLED CF_IMPLICIT_BRIDGING_DISABLED
6063
#define OB_EXPORT CF_EXPORT
6164
#define OB_BRIDGED_TYPE CF_BRIDGED_TYPE
6265

File renamed without changes.

0 commit comments

Comments
 (0)