Skip to content

Commit

Permalink
made CDatadogTesting private. Better project settings (#115)
Browse files Browse the repository at this point in the history 
fixed import of C part. fixed project settings
  • Loading branch information
@ypopovych
ypopovych authored Aug 12, 2024
1 parent 4d03bb7 commit 4b6caca
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 25 deletions.
28 changes: 10 additions & 18 deletions DatadogSDKTesting.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1767,7 +1767,7 @@
"@loader_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CDatadogSDKTesting;
Expand Down Expand Up @@ -1807,7 +1807,7 @@
"@loader_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CDatadogSDKTesting;
Expand All @@ -1825,6 +1825,7 @@
A7FC25752BA1E83500067E26 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -1866,6 +1867,7 @@
A7FC25762BA1E83500067E26 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -1907,7 +1909,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic;
GCC_DYNAMIC_NO_PIC = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -1927,7 +1928,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1945,7 +1945,6 @@
A7FC25902BA1E87400067E26 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_WARN_COMMA = NO;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
Expand Down Expand Up @@ -1983,7 +1982,6 @@
A7FC25912BA1E87400067E26 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_WARN_COMMA = NO;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
Expand Down Expand Up @@ -2021,7 +2019,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -2046,7 +2043,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -2070,7 +2066,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = IntegrationTests/App/IntegrationTests.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
Expand Down Expand Up @@ -2116,7 +2111,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = IntegrationTests/App/IntegrationTests.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
Expand Down Expand Up @@ -2160,7 +2154,6 @@
A7FC26C92BA20D1200067E26 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = IntegrationTests/App/IntegrationTests.entitlements;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -2169,7 +2162,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_LSApplicationCategoryType = "";
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.IntegrationTestsUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -2186,15 +2179,14 @@
A7FC26CA2BA20D1200067E26 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = IntegrationTests/App/IntegrationTests.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_LSApplicationCategoryType = "";
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.IntegrationTestsUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -2212,7 +2204,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -2268,7 +2260,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -2287,7 +2279,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -2340,7 +2332,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LLVM_LTO = YES_THIN;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.5.0-alpha1;
MARKETING_VERSION = "2.5.0-alpha1";
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ endef
define xcarchive
$(if $5,\
set -o pipefail; xcodebuild archive -scheme $1 -sdk $2 -destination $3 -archivePath \
build/$1/$4.xcarchive SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES | tee $1-$4-$5.log | xcbeautify,\
xcodebuild archive -scheme $1 -sdk $2 -destination $3 -archivePath build/$1/$4.xcarchive SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES)
build/$1/$4.xcarchive SKIP_INSTALL=NO | tee $1-$4-$5.log | xcbeautify,\
xcodebuild archive -scheme $1 -sdk $2 -destination $3 -archivePath build/$1/$4.xcarchive SKIP_INSTALL=NO)
endef

build/%/iphoneos.xcarchive:
Expand Down
4 changes: 2 additions & 2 deletions Sources/DatadogSDKTesting/Coverage/DDCoverageHelper.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Copyright 2020-Present Datadog, Inc.
*/

@_implementationOnly import EventsExporter
import Foundation
import CDatadogSDKTesting
@_implementationOnly import EventsExporter
@_implementationOnly import CDatadogSDKTesting

typealias cFunc = @convention(c) () -> Void

Expand Down
2 changes: 1 addition & 1 deletion Sources/DatadogSDKTesting/FrameworkLoadHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import Foundation
import CDatadogSDKTesting
@_implementationOnly import CDatadogSDKTesting

enum FrameworkLoadHandler {
static var testObserver: DDTestObserver?
Expand Down
2 changes: 1 addition & 1 deletion Sources/DatadogSDKTesting/ImageSymbols/BinaryImages.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import Foundation
import CDatadogSDKTesting
@_implementationOnly import CDatadogSDKTesting

/// It stores information about loaded mach images
struct MachOImage {
Expand Down
2 changes: 1 addition & 1 deletion Sources/DatadogSDKTesting/ImageSymbols/DDSymbolicator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation
import MachO
import CDatadogSDKTesting
@_implementationOnly import CDatadogSDKTesting
@_implementationOnly import EventsExporter

enum DDSymbolicator {
Expand Down

0 comments on commit 4b6caca

Please sign in to comment.