Обновил скриншоты, fastfile и makefile

Author: easydev991

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help setup setup_hook setup_snapshot setup_fastlane update update_fastlane update_swiftformat format screenshots build test
+.PHONY: help setup setup_hook setup_snapshot setup_fastlane update update_fastlane update_swiftformat format screenshots build test testflight upload_screenshots
 
 # Цвета и шрифт
 YELLOW=\033[1;33m
@@ -245,6 +245,14 @@ format:
 	@printf "$(YELLOW)Запуск swiftformat...$(RESET)\n"
 	@swiftformat .
 
+## build: Сборка проекта в терминале
+build:
+	xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' build
+
+## test: Запускает unit-тесты в терминале
+test:
+	xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' test -testPlan SwiftUI-DaysTests
+
 ## screenshots: Запустить fastlane snapshot для генерации скриншотов приложения
 screenshots:
 	@bash -c '\
@@ -262,14 +270,41 @@ screenshots:
 	rbenv shell $(RUBY_VERSION); \
 	bundle exec fastlane snapshot; \
 	'
+## upload_screenshots: Загрузить существующие скриншоты в App Store Connect
+upload_screenshots:
+	@bash -c '\
+	set -e; \
+	if [ ! -d fastlane ] || [ ! -f fastlane/Fastfile ]; then \
+		printf "$(YELLOW)fastlane не инициализирован в проекте$(RESET)\n"; \
+		$(MAKE) setup_fastlane; \
+		if [ ! -d fastlane ] || [ ! -f fastlane/Fastfile ]; then \
+			printf "$(RED)Нужно инициализировать fastlane перед использованием$(RESET)\n"; \
+			exit 1; \
+		fi; \
+	fi; \
+	printf "$(YELLOW)Загрузка существующих скриншотов в App Store Connect...$(RESET)\n"; \
+	eval "$$(rbenv init -)"; \
+	rbenv shell $(RUBY_VERSION); \
+	bundle exec fastlane ios upload_screenshots_only; \
+	'
 
-## build: Сборка проекта в терминале
-build:
-	xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' build
-
-## test: Запускает unit-тесты в терминале
-test:
-	xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' test -testPlan SwiftUI-DaysTests
+## testflight: Собрать и отправить сборку в TestFlight через fastlane
+testflight:
+	@bash -c '\
+	set -e; \
+	if [ ! -d fastlane ] || [ ! -f fastlane/Fastfile ]; then \
+		printf "$(YELLOW)fastlane не инициализирован в проекте$(RESET)\n"; \
+		$(MAKE) setup_fastlane; \
+		if [ ! -d fastlane ] || [ ! -f fastlane/Fastfile ]; then \
+			printf "$(RED)Нужно инициализировать fastlane перед использованием$(RESET)\n"; \
+			exit 1; \
+		fi; \
+	fi; \
+	printf "$(YELLOW)Запуск fastlane release для отправки в TestFlight...$(RESET)\n"; \
+	eval "$$(rbenv init -)"; \
+	rbenv shell $(RUBY_VERSION); \
+	bundle exec fastlane ios release; \
+	'
 
 .DEFAULT:
 	@printf "$(RED)Неизвестная команда: 'make $@'\n$(RESET)"

fastlane/Appfile

@@ -1,4 +1,5 @@
 app_identifier("com.oleg991.SwiftUI-Days") # The bundle identifier of your app
+itc_team_id("127738690") # Team ID for "Oleg Eremenko"
 # apple_id("[[APPLE_ID]]") # Your Apple Developer Portal username
 
 

fastlane/Fastfile

@@ -16,11 +16,36 @@ update_fastlane
 default_platform(:ios)
 
 platform :ios do
-  desc "Generate new localized screenshots"
+  desc "Сгенерировать новые локализованные скриншоты"
   lane :screenshots do
     capture_screenshots(scheme: "SwiftUI-DaysUITests")
   end
 
+  desc "Загрузить существующие скриншоты в App Store Connect"
+  lane :upload_screenshots_only do
+    upload_to_app_store(
+      skip_metadata: true,
+      skip_screenshots: false,
+      force: true,
+      submit_for_review: false,
+      reject_if_possible: false,
+      screenshots_path: "./fastlane/screenshots"
+    )
+  end
+
+  desc "Сгенерировать скриншоты и загрузить в App Store Connect"
+  lane :screenshots_and_upload do
+    screenshots
+    upload_to_app_store(
+      skip_metadata: true,
+      skip_screenshots: false,
+      force: true,
+      submit_for_review: false,
+      reject_if_possible: false,
+      screenshots_path: "./fastlane/screenshots"
+    )
+  end
+
   desc "Собрать и отправить сборку в TestFlight"
   lane :release do
     build_app(

fastlane/README.md

@@ -21,7 +21,23 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 [bundle exec] fastlane ios screenshots
 ```
 
-Generate new localized screenshots
+Сгенерировать новые локализованные скриншоты
+
+### ios upload_screenshots_only
+
+```sh
+[bundle exec] fastlane ios upload_screenshots_only
+```
+
+Загрузить существующие скриншоты в App Store Connect
+
+### ios screenshots_and_upload
+
+```sh
+[bundle exec] fastlane ios screenshots_and_upload
+```
+
+Сгенерировать скриншоты и загрузить в App Store Connect
 
 ### ios release
 

fastlane/Snapfile

@@ -1,5 +1,5 @@
 # A list of devices you want to take the screenshots from
-devices(["iPhone 16 Pro Max", "iPad Pro 13-inch (M4)"])
+devices(["iPhone 15 Pro Max", "iPad Pro (12.9-inch) (6th generation)"])
 
 # A list of languages which should be used. See https://docs.fastlane.tools/actions/snapshot/#available-language-codes
 languages(["en-US", "ru"])
@@ -30,3 +30,4 @@ clear_previous_screenshots(true)
 
 skip_package_dependencies_resolution(true)
 disable_package_automatic_updates(true)
+output_simulator_logs(true)