Skip to content

Commit

Permalink
Bump libctemplate to a 2.4.1 fat binary
Browse files Browse the repository at this point in the history
  • Loading branch information
bengotow committed Aug 9, 2022
1 parent 01656c8 commit 8007d5f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 10 deletions.
2 changes: 2 additions & 0 deletions MailSync.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Vendor/mailcore2/Externals/ctemplate-osx/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = (
"-DHAVE_USLEEP=1",
"-Wno-ambiguous-macro",
Expand Down Expand Up @@ -898,6 +899,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Vendor/mailcore2/Externals/ctemplate-osx/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = (
"-DHAVE_USLEEP=1",
"-Wno-ambiguous-macro",
Expand Down
4 changes: 0 additions & 4 deletions MailSync/NetworkRequestUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ const json MakeOAuthRefreshRequest(string provider, string clientId, string refr

string gmailClientId = MailUtils::getEnvUTF8("GMAIL_CLIENT_ID");
string gmailClientSecret = MailUtils::getEnvUTF8("GMAIL_CLIENT_SECRET");
spdlog::get("logger")->info(gmailClientId);
spdlog::get("logger")->info(gmailClientSecret);
spdlog::get("logger")->info(clientId);

if (provider == "gmail" && clientId == gmailClientId) {
// per https://stackoverflow.com/questions/59416326/safely-distribute-oauth-2-0-client-secret-in-desktop-applications-in-python,
// we really do need to embed this in the application and it's more an extension of the Client ID than a proper Client Secret.
Expand Down
8 changes: 4 additions & 4 deletions Vendor/libetpan/build-mac/libetpan.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2483,7 +2483,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = libetpan;
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
Expand All @@ -2502,7 +2502,7 @@
GCC_MODEL_TUNING = G5;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = libetpan;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
Expand Down Expand Up @@ -2636,7 +2636,7 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = etpan;
SDKROOT = macosx;
SKIP_INSTALL = YES;
Expand All @@ -2652,7 +2652,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
INSTALL_PATH = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = etpan;
SDKROOT = macosx;
SKIP_INSTALL = YES;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified Vendor/mailcore2/Externals/ctemplate-osx/lib/libctemplate.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4337,7 +4337,7 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = MailCore;
SDKROOT = macosx;
};
Expand All @@ -4348,7 +4348,7 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = MailCore;
SDKROOT = macosx;
};
Expand Down

0 comments on commit 8007d5f

Please sign in to comment.