Skip to content

Commit fdb00d6

Browse files
committed
Merge branch 'enhorn-swift2.3' into swift2.3
* enhorn-swift2.3: Changes so the legacy build setting is set on the project, instead of each target. Adds the legacy option to the build settings, so the project compiles.
2 parents 404fa8c + a009afc commit fdb00d6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@
782782
ONLY_ACTIVE_ARCH = YES;
783783
PRODUCT_NAME = SocketIO;
784784
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
785+
SWIFT_VERSION = 2.3;
785786
TVOS_DEPLOYMENT_TARGET = 9.0;
786787
WATCHOS_DEPLOYMENT_TARGET = 2.0;
787788
};
@@ -797,6 +798,7 @@
797798
MACOSX_DEPLOYMENT_TARGET = 10.10;
798799
PRODUCT_NAME = SocketIO;
799800
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
801+
SWIFT_VERSION = 2.3;
800802
TVOS_DEPLOYMENT_TARGET = 9.0;
801803
WATCHOS_DEPLOYMENT_TARGET = 2.0;
802804
};
@@ -1059,7 +1061,6 @@
10591061
SDKROOT = macosx;
10601062
SKIP_INSTALL = YES;
10611063
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1062-
SWIFT_VERSION = 2.3;
10631064
VERSIONING_SYSTEM = "apple-generic";
10641065
VERSION_INFO_PREFIX = "";
10651066
};
@@ -1111,7 +1112,6 @@
11111112
PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
11121113
SDKROOT = macosx;
11131114
SKIP_INSTALL = YES;
1114-
SWIFT_VERSION = 2.3;
11151115
VERSIONING_SYSTEM = "apple-generic";
11161116
VERSION_INFO_PREFIX = "";
11171117
};

0 commit comments

Comments
 (0)