Merge branch 'main' into matt/runtimeDownload

Author: MattKiazyk

.github/workflows/appcast.yml

@@ -9,21 +9,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout 🛎
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        # If you're using actions/checkout@v3 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        # If you're using actions/checkout@v4 you must set persist-credentials to false in most cases for the deployment to work correctly.
         persist-credentials: false
 
     - name: Cache 📦
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v3.3.2
       with:
         path: AppCast/vendor/bundle
         key: ${{ runner.os }}-gems-v1.0-${{ hashFiles('AppCast/Gemfile') }}
         restore-keys: |
           ${{ runner.os }}-gems-
           
     - name: Setup Ruby, JRuby and TruffleRuby
-      uses: ruby/setup-ruby@v1.144.2
+      uses: ruby/setup-ruby@v1.161.0
       with:
         ruby-version: '2.7'
 

.github/workflows/ci.yml

@@ -8,10 +8,10 @@ on:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Run tests
       env:
-        DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+        DEVELOPER_DIR: /Applications/Xcode_15.0.1.app
       run: xcodebuild test -scheme Xcodes

README.md

@@ -4,12 +4,12 @@ The easiest way to install and switch between multiple versions of Xcode.
 
 _If you're looking for a command-line version of Xcodes.app, try [`xcodes`](https://github.com/XcodesOrg/xcodes)._
 
-![CI](https://github.com/XcodesOrg/Xcodes.app/workflows/CI/badge.svg)
+![CI](https://github.com/XcodesOrg/XcodesApp/workflows/CI/badge.svg)
 
 ![](screenshot_light.png#gh-light-mode-only)
 ![](screenshot_dark.png#gh-dark-mode-only)
 
-### :tada: Announcment
+### :tada: Announcement
 
 XcodesApp is now part of the `XcodesOrg` - [read more here](nextstep.md)
 
@@ -25,14 +25,14 @@ XcodesApp is now part of the `XcodesOrg` - [read more here](nextstep.md)
 
 ## Experiments
 
-- Thanks to the wonderful work of [https://github.com/saagarjha/unxip](https://github.com/saagarjha/unxip), turn on the experiment to increase your unxipping time by up to 70%! More can be found on his repo, but bugs, high memory may occur if used. 
+- Thanks to the wonderful work of [https://github.com/saagarjha/unxip](https://github.com/saagarjha/unxip), turn on the experiment to increase your unxipping time by up to 70%! More can be found on his repo, but bugs, high memory may occur if used.
 
-![](experiment_light.jpg#gh-light-mode-only)
-![](experiment_dark.jpg#gh-dark-mode-only)
+![](experiment_light.png#gh-light-mode-only)
+![](experiment_dark.png#gh-dark-mode-only)
 
 ## Localization
 
-Xcodes supports localization in several languages. 
+Xcodes supports localization in several languages.
 
 The following languages are supported because of the following community users!
 
@@ -45,22 +45,23 @@ The following languages are supported because of the following community users!
 |Finnish 🇫🇮 |[@marcusziade](https://github.com/marcusziade)|Chinese-Traditional 🇹🇼|[@itszero](https://github.com/itszero)|
 |Ukranian 🇺🇦 |[@gelosi](https://github.com/gelosi)|Japanese 🇯🇵|[@tatsuz0u](https://github.com/tatsuz0u)|
 |German 🇩🇪|[@drct](https://github.com/drct)|Dutch 🇳🇱|[@jfversluis](https://github/com/jfversluis)|
-|Brazilian Portuguese 🇧🇷|[@brunomunizaf](https://github.com/brunomunizaf)||
+|Brazilian Portuguese 🇧🇷|[@brunomunizaf](https://github.com/brunomunizaf)|Polish 🇵🇱|[@jakex7](https://github.com/jakex7)|
+|Catalan|[@ferranabello](https://github.com/ferranabello)|
 
-Want to add more languages? Simply create a PR with the updated strings file. 
+Want to add more languages? Simply create a PR with the updated strings file.
 ## Installation
 
 Xcodes.app runs on macOS Big Sur 11.0 or later.
 
-### Homebrew Cask
+### Install with Homebrew
+
+Developer ID-signed and notarized release builds are available on Homebrew. These don't require Xcode to already be installed in order to use.
 
 ```sh
 brew install --cask xcodes
-
-# These are Developer ID-signed and notarized release builds and don't require Xcode to already be installed in order to use.
 ```
 
-### Download a release
+### Manually install
 
 1. Download the latest version [here](https://github.com/XcodesOrg/XcodesApp/releases/latest) using the **Xcodes.zip** asset. These are Developer ID-signed and notarized release builds and don't require Xcode to already be installed in order to use.
 2. Move the unzipped `Xcodes.app` to your `/Applications` directory
@@ -79,7 +80,7 @@ You'll need macOS 12 Big Sur and Xcode 13 in order to build and run Xcodes.app.
 # combine for universal binary
  lipo -create -output unxip unxip_intel unxip_m1  
 # check it
- lipo -archs unxip 
+ lipo -archs unxip
 ```
 
 Notable design decisions are recorded in [DECISIONS.md](./DECISIONS.md). The Apple authentication flow is described in [Apple.paw](./Apple.paw), which will allow you to play with the API endpoints that are involved using the [Paw](https://paw.cloud) app.

Xcodes.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -100,6 +100,7 @@
 		CAFE4AB425B7D3AF0064FE51 /* AdvancedPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4AB325B7D3AF0064FE51 /* AdvancedPreferencePane.swift */; };
 		CAFE4ABC25B7D54B0064FE51 /* UpdatesPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */; };
 		CAFFFED8259CDA5000903F81 /* XcodeListViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */; };
+		E689540325BE8C64000EBCEA /* DockProgress in Frameworks */ = {isa = PBXBuildFile; productRef = E689540225BE8C64000EBCEA /* DockProgress */; };
 		E81D7EA02805250100A205FC /* Collection+.swift in Sources */ = {isa = PBXBuildFile; fileRef = E81D7E9F2805250100A205FC /* Collection+.swift */; };
 		E872EE4E2808D4F100D3DD8B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E872EE502808D4F100D3DD8B /* Localizable.strings */; };
 		E87AB3C52939B65E00D72F43 /* Hardware.swift in Sources */ = {isa = PBXBuildFile; fileRef = E87AB3C42939B65E00D72F43 /* Hardware.swift */; };
@@ -175,6 +176,7 @@
 
 /* Begin PBXFileReference section */
 		15FAD1652811D15600B63259 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = "<group>"; };
+		23703D6E29EBF63500DFA346 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		25E2FA26284769A00014A318 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		327DF109286ABE6B00D694D5 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		36741BFC291E4FDB00A85AAE /* DownloadPreferencePane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadPreferencePane.swift; sourceTree = "<group>"; };
@@ -185,6 +187,7 @@
 		53CBAB2B263DCC9100410495 /* XcodesAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodesAlert.swift; sourceTree = "<group>"; };
 		58F743C02810A34900EEC0F3 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5AA8A6102877EDAD009ECDB0 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
+		5C3927ED28E4B486007B5119 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
 		63EAA4EA259944450046AB8F /* ProgressButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressButton.swift; sourceTree = "<group>"; };
 		6CA3A090282EBE72005A6E35 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		7CBF284E28606D2C001AA66B /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -330,6 +333,7 @@
 				E8F81FC4282D8A17006CBD0F /* Sparkle in Frameworks */,
 				CABFA9E42592F08E00380FEE /* Version in Frameworks */,
 				CABFA9FD2592F13300380FEE /* LegibleError in Frameworks */,
+				E689540325BE8C64000EBCEA /* DockProgress in Frameworks */,
 				CA9FF86D25951C6E00E47BAF /* XCModel in Frameworks */,
 				CABFA9F82592F0F900380FEE /* KeychainAccess in Frameworks */,
 				CAA858CD25A3D8BC00ACF8C0 /* ErrorHandling in Frameworks */,
@@ -672,6 +676,7 @@
 				CA9FF86C25951C6E00E47BAF /* XCModel */,
 				CAA858CC25A3D8BC00ACF8C0 /* ErrorHandling */,
 				E8F81FC3282D8A17006CBD0F /* Sparkle */,
+				E689540225BE8C64000EBCEA /* DockProgress */,
 				E8FD5726291EE4AC001E004C /* AsyncNetworkService */,
 				E8C0EB19291EF43E0081528A /* XcodesKit */,
 				E8F44A1D296B4CD7002D6592 /* Path */,
@@ -743,8 +748,10 @@
 				de,
 				uk,
 				fi,
+				ca,
 				"pt-BR",
 				nl,
+				pl,
 			);
 			mainGroup = CAD2E7952449574E00113D76;
 			packageReferences = (
@@ -756,6 +763,7 @@
 				CAA858CB25A3D8BC00ACF8C0 /* XCRemoteSwiftPackageReference "ErrorHandling" */,
 				CAC28186259EE27200B8AB0B /* XCRemoteSwiftPackageReference "CombineExpectations" */,
 				E8F81FC2282D8A17006CBD0F /* XCRemoteSwiftPackageReference "Sparkle" */,
+				E689540125BE8C64000EBCEA /* XCRemoteSwiftPackageReference "DockProgress" */,
 				E8FD5725291EE4AC001E004C /* XCRemoteSwiftPackageReference "AsyncHTTPNetworkService" */,
 				E8F44A1C296B4CD7002D6592 /* XCRemoteSwiftPackageReference "Path" */,
 			);
@@ -963,8 +971,10 @@
 				A0187D39285792D1002F46F9 /* de */,
 				7CBF284E28606D2C001AA66B /* uk */,
 				5AA8A6102877EDAD009ECDB0 /* fi */,
+				5C3927ED28E4B486007B5119 /* ca */,
 				327DF109286ABE6B00D694D5 /* pt-BR */,
 				E2AFDCCA28F024D000864ADD /* nl */,
+				23703D6E29EBF63500DFA346 /* pl */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1090,7 +1100,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				DEVELOPMENT_TEAM = PBH8V487HB;
+				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/$(TARGET_NAME)/Info.plist";
 				MARKETING_VERSION = 1.0.3;
@@ -1140,7 +1150,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				DEVELOPMENT_TEAM = PBH8V487HB;
+				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/$(TARGET_NAME)/Info.plist";
 				MARKETING_VERSION = 1.0.3;
@@ -1332,7 +1342,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = PBH8V487HB;
+				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				INFOPLIST_FILE = XcodesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1353,7 +1363,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = PBH8V487HB;
+				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				INFOPLIST_FILE = XcodesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1417,6 +1427,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/xcodereleases/data";
 			requirement = {
+				kind = revision;
+				revision = a43ad89e536d7a3da525fcc23fb182c37b756ecc;
 				branch = main;
 				kind = branch;
 			};
@@ -1469,6 +1481,14 @@
 				minimumVersion = 0.6.0;
 			};
 		};
+		E689540125BE8C64000EBCEA /* XCRemoteSwiftPackageReference "DockProgress" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/sindresorhus/DockProgress";
+			requirement = {
+				kind = upToNextMinorVersion;
+				minimumVersion = 3.2.0;
+			};
+		};
 		E8F44A1C296B4CD7002D6592 /* XCRemoteSwiftPackageReference "Path" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/mxcl/Path.swift";
@@ -1535,6 +1555,11 @@
 			package = CAC28186259EE27200B8AB0B /* XCRemoteSwiftPackageReference "CombineExpectations" */;
 			productName = CombineExpectations;
 		};
+		E689540225BE8C64000EBCEA /* DockProgress */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E689540125BE8C64000EBCEA /* XCRemoteSwiftPackageReference "DockProgress" */;
+			productName = DockProgress;
+		};
 		E8C0EB19291EF43E0081528A /* XcodesKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = XcodesKit;

Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,6 +5,7 @@ import AppleAPI
 import Version
 import LegibleError
 import os.log
+import DockProgress
 import XcodesKit
 
 /// Downloads and installs Xcodes
@@ -44,6 +45,8 @@ extension AppState {
 
         Logger.appState.info("Using \(downloader) downloader")
 
+        setupDockProgress()
+        
         return validateSession()
             .flatMap { _ in
                 self.getXcodeArchive(installationType, downloader: downloader)
@@ -52,6 +55,8 @@ extension AppState {
                 self.installArchivedXcode(xcode, at: url)
             }
             .catch { error -> AnyPublisher<InstalledXcode, Swift.Error> in
+                self.resetDockProgressTracking()
+                
                 switch error {
                 case InstallationError.damagedXIP(let damagedXIPURL):
                     guard attemptNumber < 1 else { return Fail(error: error).eraseToAnyPublisher() }
@@ -100,6 +105,7 @@ extension AppState {
             self.downloadOrUseExistingArchive(for: availableXcode, downloader: downloader, progressChanged: { [unowned self] progress in
                 DispatchQueue.main.async {
                     self.setInstallationStep(of: availableXcode.version, to: .downloading(progress: progress))
+                    self.overallProgress.addChild(progress, withPendingUnitCount: AppState.totalProgressUnits - AppState.unxipProgressWeight)
                 }
             })
             .map { return (availableXcode, $0) }
@@ -152,6 +158,7 @@ extension AppState {
             cookies
         )
         progressChanged(progress)
+        
         return publisher
             .map { _ in destination.url }
             .eraseToAnyPublisher()
@@ -166,6 +173,7 @@ extension AppState {
                                                                    to: destination.url,
                                                                    resumingWith: resumeData ?? persistedResumeData)
             progressChanged(progress)
+            
             return publisher
                 .map { $0.saveLocation }
                 .eraseToAnyPublisher()
@@ -177,6 +185,9 @@ extension AppState {
     }
 
     public func installArchivedXcode(_ availableXcode: AvailableXcode, at archiveURL: URL) -> AnyPublisher<InstalledXcode, Error> {
+        unxipProgress.completedUnitCount = 0
+        overallProgress.addChild(unxipProgress, withPendingUnitCount: AppState.unxipProgressWeight)
+        
         do {
             let destinationURL = Path.installDirectory.join("Xcode-\(availableXcode.version.descriptionWithoutBuildMetadata).app").url
             switch archiveURL.pathExtension {
@@ -416,6 +427,9 @@ extension AppState {
                 }
                 self.presentedAlert = .privilegedHelper
             }
+            
+            unxipProgress.completedUnitCount = AppState.totalProgressUnits
+            resetDockProgressTracking()
 
             return helperInstallConsentSubject
                 .flatMap { 
@@ -456,6 +470,24 @@ extension AppState {
             .eraseToAnyPublisher()
     }
 
+    // MARK: - Dock Progress Tracking
+    
+    private func setupDockProgress() {
+        DockProgress.progressInstance = nil
+        DockProgress.style = .bar
+        
+        let progress = Progress(totalUnitCount: AppState.totalProgressUnits)
+        progress.kind = .file
+        progress.fileOperationKind = .downloading
+        overallProgress = progress
+        
+        DockProgress.progressInstance = overallProgress
+    }
+    
+    func resetDockProgressTracking() {
+        DockProgress.progress = 1 // Only way to completely remove overlay with DockProgress is setting progress to complete
+    }
+    
     // MARK: - 
 
     func setInstallationStep(of version: Version, to step: InstallationStep) {