Update xcconfig tracking and provisioning (#234)

argmaxinc · Oct 29, 2024 · 9f493bc · 9f493bc
1 parent 0054f3e
commit 9f493bc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/Examples/WhisperAX/Debug.xcconfig b/Examples/WhisperAX/Debug.xcconfig
diff --git a/Makefile b/Makefile
@@ -35,15 +35,11 @@ setup:
 
 generate-whisperax-xcconfig:
 	@echo "Updating DEVELOPMENT_TEAM in Examples/WhisperAX/Debug.xcconfig..."
-	@TEAM_ID=$$(defaults read com.apple.dt.Xcode IDEProvisioningTeamManagerLastSelectedTeamID 2>/dev/null); \
+	@TEAM_ID=$$(defaults read com.apple.dt.Xcode IDEProvisioningTeams | plutil -convert json -r -o - -- - | jq -r  'to_entries[0].value | sort_by(.teamType == "Individual") | .[0].teamID' 2>/dev/null); \
 	if [ -z "$$TEAM_ID" ]; then \
 		echo "Error: No Development Team ID found. Please log into Xcode with your Apple ID and select a team."; \
 	else \
-		if grep -q '^DEVELOPMENT_TEAM' Examples/WhisperAX/Debug.xcconfig; then \
-			sed -i '' "s/^\(DEVELOPMENT_TEAM *= *\).*/\1$$TEAM_ID/" Examples/WhisperAX/Debug.xcconfig; \
-		else \
-			echo "DEVELOPMENT_TEAM=$$TEAM_ID" >> Examples/WhisperAX/Debug.xcconfig; \
-		fi; \
+		echo "DEVELOPMENT_TEAM=$$TEAM_ID" > Examples/WhisperAX/Debug.xcconfig; \
 		echo "DEVELOPMENT_TEAM has been updated in Examples/WhisperAX/Debug.xcconfig with your Development Team ID: $$TEAM_ID"; \
 	fi
 
@@ -121,7 +117,7 @@ list-devices:
 #	make benchmark-devices DEVICES="iPhone 15 Pro Max,My Mac"	# Benchmark specific device names from `make list-devices`
 DEVICES ?=
 DEBUG ?= false
-benchmark-devices:
+benchmark-devices: generate-whisperax-xcconfig
 	@if [ -n "$(DEVICES)" ]; then \
 		echo "Benchmarking specific devices: $(DEVICES)"; \
 		fastlane benchmark devices:"$(DEVICES)" debug:$(DEBUG); \

diff --git a/README.md b/README.md
@@ -30,7 +30,8 @@ Check out the demo app on [TestFlight](https://testflight.apple.com/join/LPVOyJZ
 - [Installation](#installation)
   - [Swift Package Manager](#swift-package-manager)
   - [Prerequisites](#prerequisites)
-  - [Steps](#steps)
+  - [Xcode Steps](#xcode-steps)
+  - [Package.swift](#packageswift)
   - [Homebrew](#homebrew)
 - [Getting Started](#getting-started)
   - [Quick Example](#quick-example)
@@ -52,14 +53,33 @@ WhisperKit can be integrated into your Swift project using the Swift Package Man
 - macOS 14.0 or later.
 - Xcode 15.0 or later.
 
-### Steps
+### Xcode Steps
 
 1. Open your Swift project in Xcode.
 2. Navigate to `File` > `Add Package Dependencies...`.
 3. Enter the package repository URL: `https://github.com/argmaxinc/whisperkit`.
 4. Choose the version range or specific version.
 5. Click `Finish` to add WhisperKit to your project.
 
+### Package.swift
+
+If you're using WhisperKit as part of a swift package, you can include it in your Package.swift dependencies as follows:
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "0.9.0"),
+],
+```
+
+Then add `WhisperKit` as a dependency for your target:
+
+```swift
+.target(
+    name: "YourApp",
+    dependencies: ["WhisperKit"]
+),
+```
+
 ### Homebrew
 
 You can install `WhisperKit` command line app using [Homebrew](https://brew.sh) by running the following command:

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -18,7 +18,6 @@ require 'pathname'
 COMMIT_HASH = `git rev-parse --short HEAD`.strip
 COMMIT_TIMESTAMP = `git log -1 --format=%ct`.strip
 COMMIT_TIMESTAMP = Time.at(COMMIT_TIMESTAMP.to_i).utc.strftime('%Y-%m-%dT%H%M%S')
-XCODE_TEAM_ID = `defaults read com.apple.dt.Xcode IDEProvisioningTeamManagerLastSelectedTeamID`.strip
 WORKING_DIR = Dir.pwd
 BASE_BENCHMARK_PATH = "#{WORKING_DIR}/benchmark_data".freeze
 BASE_UPLOAD_PATH = "#{WORKING_DIR}/upload_folder".freeze
@@ -196,13 +195,6 @@ def run_benchmarks(devices:, config:)
     end
   end
 
-  team_id = XCODE_TEAM_ID
-  if team_id.empty?
-    UI.user_error!('Development Team ID not found. Please log into Xcode with your Apple ID.')
-  else
-    UI.message("Using Development Team ID: #{team_id}")
-  end
-
   run_benchmark(devices, config)
 end
 
@@ -239,7 +231,7 @@ def run_benchmark(devices, config)
       xcargs = [
         "MODEL_NAME=#{model}",
         '-allowProvisioningUpdates',
-        "DEVELOPMENT_TEAM=#{XCODE_TEAM_ID}"
+        '-allowProvisioningDeviceRegistration'
       ].join(' ')
 
       scan_result = scan(
@@ -255,9 +247,7 @@ def run_benchmark(devices, config)
         output_directory: XCRESULT_PATH,
         suppress_xcode_output: false,
         result_bundle: true,
-        # show_xcode_test_logs: true
         buildlog_path: XCRESULT_PATH,
-        # include_simulator_logs: true,
         output_style: 'raw',
         fail_build: false
       )
@@ -357,7 +347,7 @@ def merge_all_summaries(summaries, devices, _config)
 
       unless result[:success]
         merged_data[:modelsTested] << model
-        merged_data[:failureInfo][model] = result[:error] || 'Test failed'
+        merged_data[:failureInfo][model] = result[:error] || "Test failed without error message, full output: #{result}"
       end
     end