Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sdk name on catalyst #2089

Closed
wants to merge 5 commits into from
Closed

Fix sdk name on catalyst #2089

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35d445e
Fix sdk name for SPM
May 29, 2020
326fdf3
Add a variable
May 29, 2020
c8af6e1
Address feedback
May 29, 2020
9723ce3
Feedback
Jun 1, 2020
a0cb767
Fix test
Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion AppCenter/AppCenter/Internals/Util/MSUtility.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@

// SDK versioning.
static ms_info_t appcenter_library_info __attribute__((section("__TEXT,__ms_ios,regular,no_dead_strip"))) = {
annakocheshkova marked this conversation as resolved.
Show resolved Hide resolved
.info_version = 1, .ms_name = APP_CENTER_C_NAME, .ms_version = APP_CENTER_C_VERSION, .ms_build = APP_CENTER_C_BUILD};
#if TARGET_OS_MACCATALYST
.info_version = 1, .ms_name = APP_CENTER_C_NAME_CATALYST, .ms_version = APP_CENTER_C_VERSION, .ms_build = APP_CENTER_C_BUILD
#else
.info_version = 1, .ms_name = APP_CENTER_C_NAME, .ms_version = APP_CENTER_C_VERSION, .ms_build = APP_CENTER_C_BUILD
#endif
};

@implementation MSUtility

Expand Down
2 changes: 1 addition & 1 deletion Config/Global.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ OTHER_CFLAGS[config=Release][sdk=appletvos*] = $(OTHER_CFLAGS) -fembed-bitcode
APPLICATION_EXTENSION_API_ONLY = YES;

// :Mark: GCC_PREPROCESSOR_DEFINITIONS
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS) APP_CENTER_CONFIGURATION_$(CONFIGURATION) APP_CENTER_NAME="@\""$(APPCENTER_SDK_NAME)"\"" APP_CENTER_VERSION="@\""$(VERSION_STRING)"\"" APP_CENTER_BUILD="@\""$(BUILD_NUMBER)"\"" APP_CENTER_C_NAME="\""$(APPCENTER_SDK_NAME)"\"" APP_CENTER_C_VERSION="\""$(VERSION_STRING)"\"" APP_CENTER_C_BUILD="\""$(BUILD_NUMBER)"\""
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS) APP_CENTER_CONFIGURATION_$(CONFIGURATION) APP_CENTER_NAME="@\""$(APPCENTER_SDK_NAME)"\"" APP_CENTER_VERSION="@\""$(VERSION_STRING)"\"" APP_CENTER_BUILD="@\""$(BUILD_NUMBER)"\"" APP_CENTER_C_NAME="\""$(APPCENTER_SDK_NAME)"\"" APP_CENTER_C_NAME_CATALYST="\""$(APPCENTER_SDK_NAME_CATALYST)"\"" APP_CENTER_C_VERSION="\""$(VERSION_STRING)"\"" APP_CENTER_C_BUILD="\""$(BUILD_NUMBER)"\""

// :Mark: Configuration of warnings. We're listing every warning that we disabled and explain the reason why.
//
Expand Down
1 change: 1 addition & 0 deletions Config/iOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
APPCENTER_SDK_NAME = appcenter.ios
APPCENTER_SDK_NAME_CATALYST = appcenter.maccatalyst
annakocheshkova marked this conversation as resolved.
Show resolved Hide resolved
SDKROOT = iphoneos
TARGETED_DEVICE_FAMILY = 1,2
SUPPORTS_MACCATALYST = YES
Expand Down
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ let package = Package(
exclude: ["Support"],
cSettings: [
.define("APP_CENTER_C_NAME", to: "\"appcenter.ios\"", .when(platforms: [.iOS])),
.define("APP_CENTER_C_NAME_CATALYST", to: "\"appcenter.maccatalyst\"", .when(platforms: [.macOS])),
.define("APP_CENTER_C_NAME", to: "\"appcenter.macos\"", .when(platforms: [.macOS])),
.define("APP_CENTER_C_NAME", to: "\"appcenter.tvos\"", .when(platforms: [.tvOS])),
.define("APP_CENTER_C_VERSION", to:"\"3.2.0\""),
Expand Down