Skip to content

Commit d6620a5

Browse files
committed
Update all xcode configurations to latest.
1 parent 0d5232d commit d6620a5

File tree

24 files changed

+157
-195
lines changed

24 files changed

+157
-195
lines changed

Configurations/Parse-iOS-Dynamic.xcconfig

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
15-
DEFINES_MODULE = YES
1615

1716
IPHONEOS_DEPLOYMENT_TARGET = 8.0
1817

19-
MACH_O_TYPE = mh_dylib
20-
DYLIB_INSTALL_NAME_BASE = @rpath
21-
2218
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
2319

24-
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
20+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
21+
GCC_WARN_SHADOW = NO

Configurations/Parse-iOS.xcconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
1515
APPLICATION_EXTENSION_API_ONLY = YES
1616

17-
MACH_O_TYPE = staticlib
18-
DEFINES_MODULE = YES
19-
2017
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
2118

2219
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
20+
21+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
22+
GCC_WARN_SHADOW = NO

Configurations/Parse-OSX.xcconfig renamed to Configurations/Parse-macOS.xcconfig

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
99

10-
#include "Shared/Platform/OSX.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
10+
#include "Shared/Platform/macOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
14-
PRODUCT_BUNDLE_IDENTIFIER = com.parse.osx
15-
16-
MACH_O_TYPE = mh_dylib
17-
DEFINES_MODULE = YES
18-
DYLIB_INSTALL_NAME_BASE = @rpath
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.macos
1915

2016
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-OSX.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-tvOS-Dynamic.xcconfig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88
//
99

1010
#include "Shared/Platform/tvOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
15-
DEFINES_MODULE = YES
16-
17-
MACH_O_TYPE = mh_dylib
18-
DYLIB_INSTALL_NAME_BASE = @rpath
19-
20-
OTHER_LDFLAGS = $(inherited) -ObjC
2115

2216
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-tvOS.xcconfig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88
//
99

1010
#include "Shared/Platform/tvOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
1515

16-
MACH_O_TYPE = staticlib
17-
APPLICATION_EXTENSION_API_ONLY = YES
18-
DEFINES_MODULE = YES
19-
20-
OTHER_LDFLAGS = $(inherited) -ObjC
21-
2216
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-watchOS-Dynamic.xcconfig

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,12 @@
88
//
99

1010
#include "Shared/Platform/watchOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
1515

16-
MACH_O_TYPE = mh_dylib
17-
DYLIB_INSTALL_NAME_BASE = @rpath
18-
19-
APPLICATION_EXTENSION_API_ONLY = YES
20-
DEFINES_MODULE = YES
21-
ENABLE_BITCODE = YES
22-
23-
OTHER_LDFLAGS = $(inherited) -ObjC
24-
2516
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-watchOS.xcconfig

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
//
99

1010
#include "Shared/Platform/watchOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
1515

16-
MACH_O_TYPE = staticlib
17-
APPLICATION_EXTENSION_API_ONLY = YES
18-
DEFINES_MODULE = YES
19-
ENABLE_BITCODE = YES
20-
21-
OTHER_LDFLAGS = $(inherited) -ObjC
22-
2316
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/ParseUnitTests-iOS.xcconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212

1313
PRODUCT_NAME = ParseUnitTests-iOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
@@ -19,3 +19,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0
1919
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
2020

2121
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
22+
23+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
24+
GCC_WARN_SHADOW = NO

Configurations/ParseUnitTests-OSX.xcconfig renamed to Configurations/ParseUnitTests-macOS.xcconfig

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
99

10-
#include "Shared/Platform/OSX.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
10+
#include "Shared/Platform/macOS.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212

13-
PRODUCT_NAME = ParseUnitTests-OSX
13+
PRODUCT_NAME = ParseUnitTests-macOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
15-
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx
15+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS
1616

1717
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
18-
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks
1918

2019
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
20+
21+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
22+
GCC_WARN_SHADOW = NO

0 commit comments

Comments
 (0)