2.2.0

FuzzyIdeas · Oct 8, 2023 · 62a4d10 · 62a4d10
1 parent 54c5b92
commit 62a4d10
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 24 deletions.
diff --git a/Clop.xcodeproj/project.pbxproj b/Clop.xcodeproj/project.pbxproj
@@ -136,7 +136,6 @@
 		C7760AC22A5FF89B00851F8C /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
 		C78211082A5B21A4008DB106 /* Xattr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Xattr.swift; sourceTree = "<group>"; };
 		C78B29FE2AD0826F00B6A19B /* InstallCLI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InstallCLI.swift; sourceTree = "<group>"; };
-		C78B2A002AD184D400B6A19B /* Lowtech */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Lowtech; path = ../Lowtech; sourceTree = "<group>"; };
 		C78B2A012AD1F02E00B6A19B /* ResolutionField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResolutionField.swift; sourceTree = "<group>"; };
 		C7956A3F2AC208DD00C0EDF2 /* ClopCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ClopCLI; sourceTree = BUILT_PRODUCTS_DIR; };
 		C7956A412AC208DD00C0EDF2 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
@@ -229,7 +228,6 @@
 		C7AB6618288301590041BEC8 = {
 			isa = PBXGroup;
 			children = (
-				C78B2A002AD184D400B6A19B /* Lowtech */,
 				C70B5F302AC029DA00345739 /* Shared.swift */,
 				C7AB6623288301590041BEC8 /* Clop */,
 				C70B5F1B2AC014BF00345739 /* FinderOptimiser */,
@@ -548,7 +546,7 @@
 				CODE_SIGN_ENTITLEMENTS = FinderOptimiser/FinderOptimiser.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.2.0b1;
+				CURRENT_PROJECT_VERSION = 2.2.0;
 				DEVELOPMENT_TEAM = RDDXV84A73;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -564,7 +562,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.2.0b1;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop.FinderOptimiser;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -581,7 +579,7 @@
 				CODE_SIGN_ENTITLEMENTS = FinderOptimiser/FinderOptimiser.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.2.0b1;
+				CURRENT_PROJECT_VERSION = 2.2.0;
 				DEVELOPMENT_TEAM = RDDXV84A73;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -597,7 +595,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.2.0b1;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop.FinderOptimiser;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -779,7 +777,7 @@
 				CODE_SIGN_ENTITLEMENTS = Clop/Clop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.2.0b1;
+				CURRENT_PROJECT_VERSION = 2.2.0;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Clop/Preview Content\"";
 				DEVELOPMENT_TEAM = RDDXV84A73;
@@ -800,7 +798,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.2.0b1;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -817,7 +815,7 @@
 				CODE_SIGN_ENTITLEMENTS = Clop/Clop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.2.0b1;
+				CURRENT_PROJECT_VERSION = 2.2.0;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Clop/Preview Content\"";
 				DEVELOPMENT_TEAM = RDDXV84A73;
@@ -838,7 +836,7 @@
 				);
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.2.0b1;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Clop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Clop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -63,6 +63,15 @@
         "revision" : "9c41991631605c8ccfe0347bbcb5c659169f2ec5"
       }
     },
+    {
+      "identity" : "lowtech",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FuzzyIdeas/Lowtech",
+      "state" : {
+        "branch" : "ventura",
+        "revision" : "2198b8467980b5008bcf89a1ef8a5f59663d9645"
+      }
+    },
     {
       "identity" : "magnet",
       "kind" : "remoteSourceControl",

diff --git a/Clop.xcodeproj/xcuserdata/alin.xcuserdatad/xcschemes/xcschememanagement.plist b/Clop.xcodeproj/xcuserdata/alin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>ClopCLI.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Example (Playground) 1.xcscheme</key>
 		<dict>
@@ -80,7 +80,7 @@
 		<key>FinderOptimiser.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>SwiftDate (Playground) 1.xcscheme</key>
 		<dict>

diff --git a/Clop/ActionButtons.swift b/Clop/ActionButtons.swift
@@ -231,7 +231,7 @@ struct ActionButtons: View {
             }
 
             Spacer()
-            Divider().background(.primary)
+            Divider().background(.secondary)
             Spacer()
 
             ShowInFinderButton(optimiser: optimiser)

diff --git a/Clop/FloatingResult.swift b/Clop/FloatingResult.swift
@@ -71,7 +71,7 @@ struct FloatingResultContainer: View {
 
     var body: some View {
         let optimisers = om.optimisers.filter(!\.hidden).sorted(by: \.startedAt, order: .reverse)
-        VStack(spacing: 10) {
+        VStack(alignment: floatingResultsCorner.isTrailing ? .trailing : .leading, spacing: 10) {
             if optimisers.isNotEmpty {
                 if (alwaysShowCompactResults && !isPreview) || optimisers.count > 5 || om.compactResults {
                     CompactResultList(optimisers: optimisers, progress: om.progress, doneCount: om.doneCount, failedCount: om.failedCount, visibleCount: om.visibleCount).preview(isPreview)

diff --git a/ReleaseNotes/2.2.0b1.md → ReleaseNotes/2.2.0.md b/ReleaseNotes/2.2.0b1.md → ReleaseNotes/2.2.0.md
diff --git a/Releases/appcast.xml b/Releases/appcast.xml
@@ -2,16 +2,15 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
         <item>
-            <title>2.2.0b1</title>
-            <pubDate>Fri, 06 Oct 2023 21:51:21 +0300</pubDate>
+            <title>2.2.0</title>
+            <pubDate>Sun, 08 Oct 2023 19:38:14 +0300</pubDate>
             <link>https://lowtechguys.com/clop</link>
             <sparkle:fullReleaseNotesLink>https://github.com/FuzzyIdeas/Clop/releases</sparkle:fullReleaseNotesLink>
-            <sparkle:channel>beta</sparkle:channel>
-            <sparkle:version>2.2.0b1</sparkle:version>
-            <sparkle:shortVersionString>2.2.0b1</sparkle:shortVersionString>
+            <sparkle:version>2.2.0</sparkle:version>
+            <sparkle:shortVersionString>2.2.0</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
-            <sparkle:releaseNotesLink>https://files.lowtechguys.com/ReleaseNotes/Clop-2.2.0b1.html</sparkle:releaseNotesLink>
-            <enclosure url="https://files.lowtechguys.com/releases/Clop-2.2.0b1.dmg" length="89858104" type="application/octet-stream" sparkle:edSignature="IAgLJ/xBhLrrfHCFSTnQQJ020IPBwCp4qlz2z40dCVqinwn/GDpfav0pcCQbXv72SiESr9YdVgzRweYS3wzkDQ=="/>
+            <sparkle:releaseNotesLink>https://files.lowtechguys.com/ReleaseNotes/Clop-2.2.0.html</sparkle:releaseNotesLink>
+            <enclosure url="https://files.lowtechguys.com/releases/Clop-2.2.0.dmg" length="89953953" type="application/octet-stream" sparkle:edSignature="fqRm8y8FnxIeY/X2S6xz5hMEljtpMwFLFxGP6DEp1R2zqd7xUNSRm6aAA36RfJbNG/8/aaMZmNepAyaPhb3JDA=="/>
         </item>
         <item>
             <title>2.1.3</title>
@@ -24,11 +23,11 @@
             <sparkle:releaseNotesLink>https://files.lowtechguys.com/ReleaseNotes/Clop-2.1.3.html</sparkle:releaseNotesLink>
             <enclosure url="https://files.lowtechguys.com/releases/Clop-2.1.3.dmg" length="52824217" type="application/octet-stream" sparkle:edSignature="x2tPwDTCPNR50RTIQP/4hTzuyqIMqPWP8rJBjdXvgkOAA4UsbOwiMyIJgf1DrIdG7Zc8Whtg/EYB0u+9Mxc7Bg=="/>
             <sparkle:deltas>
-                <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.1.1.delta" sparkle:deltaFrom="2.1.1" length="276810" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="jteIuPD9m6iKeenNuvsvmHw9tANUp0JjA/qf8p6hHT/EkczglxYv51QJoyPWR5cGuXj9mayNx9zhAN6P2ZrkDA=="/>
                 <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.1.2.delta" sparkle:deltaFrom="2.1.2" length="256446" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="HWAIj9+Aphev11Zi4iTlqEiVqPDlwADn+zgDnacMX8rtAYJTlw44/EAaB/Foa2N1JSAYNOHMrzyRYwwdk+Z0Ag=="/>
+                <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.1.1.delta" sparkle:deltaFrom="2.1.1" length="276810" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="jteIuPD9m6iKeenNuvsvmHw9tANUp0JjA/qf8p6hHT/EkczglxYv51QJoyPWR5cGuXj9mayNx9zhAN6P2ZrkDA=="/>
                 <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.0.3.delta" sparkle:deltaFrom="2.0.3" length="1015878" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="0DOEMTxnlCqRBmURXxEAUWM2vQuIBGTWKsX4DZbjII2U1bCSpHmA+ZKSmQuYlU1hTd7XLObPgmNMFN1/CJ7aAw=="/>
-                <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.0.1.delta" sparkle:deltaFrom="2.0.1" length="1120938" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="UT8ccwAyvKIGZQ3k/lrA4Ixw2C8++cTYCfQ2anesQ7wvPCaTd/uGht1U3fOnRaXf8xHgVDiTBiHBTuBDCRP3BQ=="/>
                 <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.0.2.delta" sparkle:deltaFrom="2.0.2" length="1119458" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="kN8Ku5A8UFUVIhCUbqLoHlq8V0h1Uw7eTbgEIk4K5vDMngNMQeaZSAJKAugYcMPscxkSIR+Z6EprPcjNf1dlBQ=="/>
+                <enclosure url="https://files.lowtechguys.com/releases/Clop2.1.3-2.0.1.delta" sparkle:deltaFrom="2.0.1" length="1120938" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="UT8ccwAyvKIGZQ3k/lrA4Ixw2C8++cTYCfQ2anesQ7wvPCaTd/uGht1U3fOnRaXf8xHgVDiTBiHBTuBDCRP3BQ=="/>
             </sparkle:deltas>
         </item>
         <item>
@@ -123,4 +122,4 @@
             <enclosure url="https://files.lowtechguys.com/releases/Clop-2.0.0.dmg" length="52450876" type="application/octet-stream" sparkle:edSignature="+Lh+I7U8ntCqtb4PvTOjcSlMeKTRuz5vD+M9f4M7KKdCMX4LZI+rilRFC1bR1XgR4TkW87C9LYWgwuqDkSNQCg=="/>
         </item>
     </channel>
-</rss>
+</rss>