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.

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

[pull] master from objective-see:master #11

Merged
merged 2 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
version bump to v2.6.3
  • Loading branch information
objective-see committed Mar 6, 2024
commit 2e5abced7f6a3ae5298bfbddca8882926f52c359
6 changes: 3 additions & 3 deletions DMG/createDMG.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
printf "\nCreating LuLu Disk Image...\n\n"

create-dmg \
--volname "LuLu v2.6.2" \
--volname "LuLu v2.6.3" \
--volicon "LuLu.icns" \
--background "background.png" \
--window-pos 200 120 \
Expand All @@ -10,11 +10,11 @@ create-dmg \
--icon "LuLu.app" 200 190 \
--hide-extension "LuLu.app" \
--app-drop-link 600 190 \
"LuLu_2.6.2.dmg" \
"LuLu_2.6.3.dmg" \
"Release/"

printf "\nCode signing dmg...\n"

codesign --force --sign "Developer ID Application: Objective-See, LLC (VBG97UB4TA)" LuLu_2.6.2.dmg
codesign --force --sign "Developer ID Application: Objective-See, LLC (VBG97UB4TA)" LuLu_2.6.3.dmg

printf "Done!\n"
2 changes: 1 addition & 1 deletion LuLu/App/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ -(IBAction)quit:(id)sender
[NSApp activateIgnoringOtherApps:YES];

//show alert
response = showAlert(NSAlertStyleInformational, @"Quit LuLu?", @"...this will terminated LuLu, until the next time you log in.", @[@"Quit", @"Cancel"]);
response = showAlert(NSAlertStyleInformational, @"Quit LuLu?", @"...this will terminate LuLu, until the next time you log in.", @[@"Quit", @"Cancel"]);

//show alert
// cancel? ignore
Expand Down
16 changes: 8 additions & 8 deletions LuLu/LuLu.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -754,7 +754,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.app";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -770,7 +770,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -780,7 +780,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.app";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "LuLu Application";
Expand All @@ -793,7 +793,7 @@
CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -805,7 +805,7 @@
);
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.extension";
PRODUCT_NAME = "com.objective-see.lulu.extension";
Expand All @@ -820,7 +820,7 @@
CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -832,7 +832,7 @@
);
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.extension";
PRODUCT_NAME = "com.objective-see.lulu.extension";
PROVISIONING_PROFILE_SPECIFIER = "LuLu Extension";
Expand Down
16 changes: 8 additions & 8 deletions Uninstaller/Uninstaller.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Helper/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -372,13 +372,13 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Helper/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
OTHER_LDFLAGS = (
"-sectcreate",
Expand Down Expand Up @@ -409,15 +409,15 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Uninstaller/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.config";
Expand All @@ -439,15 +439,15 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.6.2;
CURRENT_PROJECT_VERSION = 2.6.3;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Uninstaller/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.6.2;
MARKETING_VERSION = 2.6.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.config";
Expand Down