version bump / UI fixes / DMG script

objective-see · Oct 15, 2024 · 4d4ae5d · 4d4ae5d
1 parent 14169ee
commit 4d4ae5d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/DMG/createDMG.sh b/DMG/createDMG.sh
@@ -1,7 +1,9 @@
+VERSION="2.9.5"
+
 printf "\nCreating LuLu Disk Image...\n\n"
 
 create-dmg \
-  --volname "LuLu v2.6.3" \
+  --volname "LuLu v$VERSION" \
   --volicon "LuLu.icns" \
   --background "background.png" \
   --window-pos 200 120 \
@@ -10,11 +12,11 @@ create-dmg \
   --icon "LuLu.app" 200 190 \
   --hide-extension "LuLu.app" \
   --app-drop-link 600 190 \
-  "LuLu_2.6.3.dmg" \
+  "LuLu_$VERSION.dmg" \
   "Release/"
 
 printf "\nCode signing dmg...\n"
 
-codesign --force --sign "Developer ID Application: Objective-See, LLC (VBG97UB4TA)" LuLu_2.6.3.dmg
+codesign --force --sign "Developer ID Application: Objective-See, LLC (VBG97UB4TA)" LuLu_$VERSION.dmg
 
 printf "Done!\n"
diff --git a/LuLu/App/Base.lproj/Preferences.xib b/LuLu/App/Base.lproj/Preferences.xib
@@ -9,6 +9,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="PrefsWindowController">
             <connections>
                 <outlet property="allowList" destination="4CH-OQ-Fxj" id="axT-m4-YDv"/>
+                <outlet property="blockList" destination="n5J-8K-UDy" id="BmA-b5-ppb"/>
                 <outlet property="listsView" destination="Nkz-5s-cqG" id="Ji5-bu-0Vr"/>
                 <outlet property="modesView" destination="K6i-xr-27e" id="DOb-L3-eeR"/>
                 <outlet property="passiveModeAction" destination="CBy-MH-fsc" id="EwM-q6-3ff"/>

diff --git a/LuLu/App/Base.lproj/Rules.xib b/LuLu/App/Base.lproj/Rules.xib
@@ -106,16 +106,20 @@
                                                     <rect key="frame" x="1" y="53" width="780" height="50"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jpF-QT-jfh">
-                                                            <rect key="frame" x="-1" y="13" width="809" height="20"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jpF-QT-jfh">
+                                                            <rect key="frame" x="1" y="13" width="778" height="20"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" title="connection info" id="tZf-9e-yHh">
                                                                 <font key="font" size="17" name="Menlo-Regular"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="trailing" secondItem="jpF-QT-jfh" secondAttribute="trailing" constant="3" id="Mf6-7V-C48"/>
+                                                        <constraint firstItem="jpF-QT-jfh" firstAttribute="leading" secondItem="Tec-Zl-6cm" secondAttribute="leading" constant="3" id="emp-cE-Z8y"/>
+                                                        <constraint firstItem="jpF-QT-jfh" firstAttribute="top" secondItem="Tec-Zl-6cm" secondAttribute="top" constant="17" id="opg-Gi-wb1"/>
+                                                    </constraints>
                                                     <connections>
                                                         <outlet property="textField" destination="jpF-QT-jfh" id="NNr-pk-0TP"/>
                                                     </connections>

diff --git a/LuLu/LuLu.xcodeproj/project.pbxproj b/LuLu/LuLu.xcodeproj/project.pbxproj
@@ -850,7 +850,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.5;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -861,7 +861,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -878,7 +878,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.5;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -889,7 +889,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "LuLu Application";
@@ -903,7 +903,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.5;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -915,7 +915,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.extension";
 				PRODUCT_NAME = "com.objective-see.lulu.extension";
@@ -930,7 +930,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.5;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -942,7 +942,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.extension";
 				PRODUCT_NAME = "com.objective-see.lulu.extension";
 				PROVISIONING_PROFILE_SPECIFIER = "LuLu Extension";