From 028230003e9ddf09032a2d0843360279b1d05d89 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 12:04:51 +0300 Subject: [PATCH 01/30] feat(fastlane): add fastlane --- ios/Gemfile | 3 +++ ios/Runner.xcodeproj/project.pbxproj | 6 +++--- ios/fastlane/Appfile | 8 ++++++++ ios/fastlane/Fastfile | 25 +++++++++++++++++++++++++ pubspec.yaml | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 ios/Gemfile create mode 100644 ios/fastlane/Appfile create mode 100644 ios/fastlane/Fastfile diff --git a/ios/Gemfile b/ios/Gemfile new file mode 100644 index 00000000..7a118b49 --- /dev/null +++ b/ios/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c2ccb23a..81cbe037 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -389,7 +389,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -539,7 +539,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -577,7 +577,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 7; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile new file mode 100644 index 00000000..b36199d4 --- /dev/null +++ b/ios/fastlane/Appfile @@ -0,0 +1,8 @@ +app_identifier("com.eatvioapp.app") # The bundle identifier of your app +apple_id("eatvio2023@icloud.com") # Your Apple Developer Portal username + +itc_team_id("126794592") # App Store Connect Team ID +team_id("VL68C36HYS") # Developer Portal Team ID + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile new file mode 100644 index 00000000..73e1657e --- /dev/null +++ b/ios/fastlane/Fastfile @@ -0,0 +1,25 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:ios) + +platform :ios do + desc "Push a new beta build to TestFlight" + lane :beta do + increment_build_number(xcodeproj: "Runner.xcodeproj") + build_app(workspace: "Runner.xcworkspace", scheme: "Runner") + upload_to_testflight + end +end diff --git a/pubspec.yaml b/pubspec.yaml index 46ddf5d1..1b99db27 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.0.51+6 +version: 1.1.1+1 publish_to: 'none' environment: From c887ec4b59c1c1a8e201510198a283dab1e0d154 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 12:08:08 +0300 Subject: [PATCH 02/30] feat(fastlane): add checkout --- .gitea/workflows/test-flight-cd.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 70fbcd94..5956fb7a 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -8,6 +8,9 @@ jobs: build: runs-on: [macos-arm64] steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Run Fastlane run: | cd ios From d2ac34e6d7bc562c6d1212b6e904ee41b5c253e3 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 12:31:35 +0300 Subject: [PATCH 03/30] feat(fastlane): complete --- .gitea/workflows/test-flight-cd.yaml | 9 ++++++++ ios/Runner.xcodeproj/project.pbxproj | 6 +++--- ios/Runner/Info.plist | 2 +- ios/fastlane/.env.default | 2 ++ ios/fastlane/README.md | 32 ++++++++++++++++++++++++++++ ios/fastlane/report.xml | 28 ++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 ios/fastlane/.env.default create mode 100644 ios/fastlane/README.md create mode 100644 ios/fastlane/report.xml diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 5956fb7a..abf7d0cd 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -10,6 +10,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + + - name: Flutter build + run: | + flutter clean + flutter pub get + flutter pub upgrade + flutter pub run build_runner build --delete-conflicting-outputs + cd ios + pod update - name: Run Fastlane run: | diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 81cbe037..12490b49 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -538,7 +538,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -576,7 +576,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index b6470ce4..eada9fab 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - $(FLUTTER_BUILD_NUMBER) + 9 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/fastlane/.env.default b/ios/fastlane/.env.default new file mode 100644 index 00000000..49b144e2 --- /dev/null +++ b/ios/fastlane/.env.default @@ -0,0 +1,2 @@ +FASTLANE_USER=eatvio2023@icloud.com +FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD=iqsm-pfxm-bpmg-nkry \ No newline at end of file diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md new file mode 100644 index 00000000..891747df --- /dev/null +++ b/ios/fastlane/README.md @@ -0,0 +1,32 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## iOS + +### ios beta + +```sh +[bundle exec] fastlane ios beta +``` + +Push a new beta build to TestFlight + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml new file mode 100644 index 00000000..c86e2b65 --- /dev/null +++ b/ios/fastlane/report.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 457ae25dc848a6c0b2532c803919104a99e12f8c Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 09:34:32 +0000 Subject: [PATCH 04/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index abf7d0cd..a6d47527 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -19,8 +19,14 @@ jobs: flutter pub run build_runner build --delete-conflicting-outputs cd ios pod update + env: + LANG: en_US.UTF-8 + LC_ALL: en_US.UTF-8 - name: Run Fastlane run: | cd ios - fastlane beta \ No newline at end of file + fastlane beta + env: + LANG: en_US.UTF-8 + LC_ALL: en_US.UTF-8 \ No newline at end of file From 2480f205638596ab37cd6b5c6ece78515a658393 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:12:50 +0000 Subject: [PATCH 05/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index a6d47527..cab49429 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -22,6 +22,13 @@ jobs: env: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 + + - name: Flutter build ipa + run: | + flutter build ipa --release + env: + LANG: en_US.UTF-8 + LC_ALL: en_US.UTF-8 - name: Run Fastlane run: | From 31712f3c40acecb42da1582275c0924b6008e593 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:17:06 +0000 Subject: [PATCH 06/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index cab49429..cb58e77c 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -19,20 +19,6 @@ jobs: flutter pub run build_runner build --delete-conflicting-outputs cd ios pod update - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 - - - name: Flutter build ipa - run: | - flutter build ipa --release - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 - - - name: Run Fastlane - run: | - cd ios fastlane beta env: LANG: en_US.UTF-8 From 305d103eb7aa6f2b0afb452c8240c5f360880540 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:33:07 +0000 Subject: [PATCH 07/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 73e1657e..b860fcc0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,8 +18,9 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do + match(type: "appstore", readonly: true) increment_build_number(xcodeproj: "Runner.xcodeproj") - build_app(workspace: "Runner.xcworkspace", scheme: "Runner") + build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight end end From 737bb3b1e52ed8475a6970784dde54dc66a6da93 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:35:44 +0000 Subject: [PATCH 08/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index b860fcc0..15bff2f4 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore", readonly: true) + match(type: "appstore", readonly: true, git_branch: "master") increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From e52feae03a898f4d5cbbe00964a4b3b949f2d569 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:36:53 +0000 Subject: [PATCH 09/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index cb58e77c..eab5ae9c 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -22,4 +22,6 @@ jobs: fastlane beta env: LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 \ No newline at end of file + LC_ALL: en_US.UTF-8 + MATCH_PASSWORD: EeChahboo9Ei + MATCH_GIT_URL: http://gitea.office.local:3000/eatvio/eatvio_app \ No newline at end of file From f5577e00e75042ca6c4b4dfb9f08484a2d37dd4f Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:40:48 +0000 Subject: [PATCH 10/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index eab5ae9c..b0aec7dc 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -24,4 +24,4 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: http://gitea.office.local:3000/eatvio/eatvio_app \ No newline at end of file + MATCH_GIT_URL: https://mso7nueh:Aa4dRo48N@gitea.office.local:3000/eatvio/eatvio_app \ No newline at end of file From d3a1c2fe26c9fb8914ca893b2348873b604c261a Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 10:44:59 +0000 Subject: [PATCH 11/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index b0aec7dc..b737a4a2 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -11,6 +11,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up SSH access to Gitea + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan gitea.office.local >> ~/.ssh/known_hosts + - name: Flutter build run: | flutter clean @@ -24,4 +31,4 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: https://mso7nueh:Aa4dRo48N@gitea.office.local:3000/eatvio/eatvio_app \ No newline at end of file + MATCH_GIT_URL: git@gitea.office.local:eatvio/eatvio_app.git \ No newline at end of file From 6e29a2f92cd98af99dc7758587ffeabdc0e3d768 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:01:54 +0000 Subject: [PATCH 12/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 15bff2f4..d8476fb0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore", readonly: true, git_branch: "master") + match(type: "appstore", readonly: true, git_branch: "master", clone_branch_directly: true) increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From 17e0d53c1b6c1a4ab95f847ffb914d2a77c49bfe Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:11:23 +0000 Subject: [PATCH 13/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index b737a4a2..4e5983c7 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -11,13 +11,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Set up SSH access to Gitea - run: | - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan gitea.office.local >> ~/.ssh/known_hosts - - name: Flutter build run: | flutter clean @@ -31,4 +24,4 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: git@gitea.office.local:eatvio/eatvio_app.git \ No newline at end of file + MATCH_GIT_URL: mso7nueh/Fastlane \ No newline at end of file From 84c8cb0fc17db84d107fbaf512e6575b144610b5 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:11:41 +0000 Subject: [PATCH 14/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index d8476fb0..b860fcc0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore", readonly: true, git_branch: "master", clone_branch_directly: true) + match(type: "appstore", readonly: true) increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From 5e89c5e9c675b4ec8d5851462b51b69cc61efaf4 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:13:07 +0000 Subject: [PATCH 15/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 4e5983c7..8a58bf8f 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -24,4 +24,4 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: mso7nueh/Fastlane \ No newline at end of file + MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/Fastlane.git \ No newline at end of file From 5fa1ca6bf2d9a25dcf349de5b332fde1fc54babd Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:14:45 +0000 Subject: [PATCH 16/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index b860fcc0..4c53abd3 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore", readonly: true) + match(type: "appstore") increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From 23fe075bfdda637d3976fa11663aed5fe51fb818 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:18:32 +0000 Subject: [PATCH 17/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 8a58bf8f..813ec37c 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -24,4 +24,6 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/Fastlane.git \ No newline at end of file + MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/Fastlane.git + FASTLANE_USER: eatvio2023@icloud.com + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: iqsm-pfxm-bpmg-nkry \ No newline at end of file From 0c68482f21f1d89cbefeda015d4f54a6c4d5d2c5 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:21:13 +0000 Subject: [PATCH 18/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 4c53abd3..b860fcc0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore") + match(type: "appstore", readonly: true) increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From 76f73a77c3dadd69370bc9f080b1b5123568bce7 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:23:43 +0000 Subject: [PATCH 19/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index b860fcc0..4c53abd3 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:ios) platform :ios do desc "Push a new beta build to TestFlight" lane :beta do - match(type: "appstore", readonly: true) + match(type: "appstore") increment_build_number(xcodeproj: "Runner.xcodeproj") build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") upload_to_testflight From d92f511aa510a8bbeae0e84f88df1ab2bf2a1206 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:25:16 +0000 Subject: [PATCH 20/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 813ec37c..ce0136f7 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -26,4 +26,5 @@ jobs: MATCH_PASSWORD: EeChahboo9Ei MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/Fastlane.git FASTLANE_USER: eatvio2023@icloud.com + FASTLANE_PASSWORD: EeChahboo9Ei FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: iqsm-pfxm-bpmg-nkry \ No newline at end of file From b1884e7863ed12e2dbcfa8b3b46d8a946ea64801 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 11:41:09 +0000 Subject: [PATCH 21/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index ce0136f7..5d7e74ae 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -24,7 +24,7 @@ jobs: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 MATCH_PASSWORD: EeChahboo9Ei - MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/Fastlane.git + MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane FASTLANE_USER: eatvio2023@icloud.com FASTLANE_PASSWORD: EeChahboo9Ei FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: iqsm-pfxm-bpmg-nkry \ No newline at end of file From 2adedf16aed9f2d925c8e268191568fd40cf0705 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 15:50:42 +0300 Subject: [PATCH 22/30] feat(comments): onTap to profile --- lib/features/feed/models/comment_model.dart | 1 + .../presentation/widgets/comments_widget.dart | 26 ++++++++++++++++--- .../widgets/consultant_widget.dart | 5 +++- .../presentation/pages/profile_screen.dart | 14 +++++----- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/lib/features/feed/models/comment_model.dart b/lib/features/feed/models/comment_model.dart index 1fbcb145..258bbd17 100644 --- a/lib/features/feed/models/comment_model.dart +++ b/lib/features/feed/models/comment_model.dart @@ -20,6 +20,7 @@ class Comment with _$Comment { const factory Comment({ @JsonKey(name: "id") required int id, @JsonKey(name: "author_name") required String authorName, + @JsonKey(name: "author_slug") required String authorSlug, @JsonKey(name: "author_profile_icon") required String authorProfileIcon, @JsonKey(name: "body") required String body, @JsonKey(name: "children_comments") required List childrenComments, diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart index 338e4f5a..b12b691e 100644 --- a/lib/features/feed/presentation/widgets/comments_widget.dart +++ b/lib/features/feed/presentation/widgets/comments_widget.dart @@ -1,10 +1,15 @@ +import 'package:eatvio_app/core/locator_service.dart'; import 'package:eatvio_app/core/utils/date_time_utils.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart'; import 'package:eatvio_app/features/feed/models/comment_model.dart'; +import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'; import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart'; import 'package:eatvio_app/generated/l10n.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; enum CommentSourceType { blogPost, recipe, diet, plan } @@ -59,10 +64,23 @@ class _CommentsWidgetState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - CircleAvatar( - foregroundImage: NetworkImage(comment.authorProfileIcon), - backgroundImage: const AssetImage('assets/images/no_avatar.png'), - radius: radius, + GestureDetector( + onTap: () { + GoRouter.of(context).pushNamed( + 'profileScreen', + extra: Author( + authorSlug: comment.authorSlug, + authorName: comment.authorName, + authorProfileIcon: comment.authorProfileIcon, + authorIsMe: (sl().state as ProfileAvatarStateLoaded).profile.slug == comment.authorSlug ? true : false, + ), + ); + }, + child: CircleAvatar( + foregroundImage: NetworkImage(comment.authorProfileIcon), + backgroundImage: const AssetImage('assets/images/no_avatar.png'), + radius: radius, + ), ), const SizedBox(width: 8), Column( diff --git a/lib/features/feed/presentation/widgets/consultant_widget.dart b/lib/features/feed/presentation/widgets/consultant_widget.dart index 061bc0db..5246d348 100644 --- a/lib/features/feed/presentation/widgets/consultant_widget.dart +++ b/lib/features/feed/presentation/widgets/consultant_widget.dart @@ -1,6 +1,9 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/const.dart'; +import 'package:eatvio_app/core/locator_service.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart'; import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'; import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart'; import 'package:eatvio_app/features/profile/models/badge_model.dart'; @@ -26,7 +29,7 @@ class ConsultantWidget extends StatelessWidget { authorSlug: consultant.slug, authorName: consultant.name, authorProfileIcon: consultant.photo, - authorIsMe: false, + authorIsMe: (sl().state as ProfileAvatarStateLoaded).profile.slug == consultant.slug ? true : false, ), ); }, diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index e127d68c..df96f608 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -66,7 +66,7 @@ class _ProfileScreenState extends State { @override void initState() { super.initState(); - widget.author == null ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug); + widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug); } @override @@ -89,11 +89,11 @@ class _ProfileScreenState extends State { } isFirstFetch = false; } - return widget.author == null ? _myProfileScreen(state) : _profileScreen(state); + return widget.author == null || widget.author!.authorIsMe ? _myProfileScreen(state) : _profileScreen(state); } else if (state is ProfileStateError) { return DataErrorWidget( onReload: () async { - widget.author == null ? await profileCubit.getMyProfile() : await profileCubit.getProfileBySlug(widget.author!.authorSlug); + widget.author == null || widget.author!.authorIsMe ? await profileCubit.getMyProfile() : await profileCubit.getProfileBySlug(widget.author!.authorSlug); }, ); } else { @@ -393,7 +393,7 @@ class _ProfileScreenState extends State { ), ), Text( - widget.author == null ? 'Редактировать' : '', + widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '', style: const TextStyle( color: Color(0xFF2F80ED), fontSize: 16, @@ -478,7 +478,7 @@ class _ProfileScreenState extends State { ), ), Text( - widget.author == null ? 'Редактировать' : '', + widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '', style: const TextStyle( color: Color(0xFF2F80ED), fontSize: 16, @@ -955,12 +955,12 @@ class _ProfileScreenState extends State { value: 'view', child: Text('Посмотреть'), ), - if (widget.author == null) + if (widget.author == null || widget.author!.authorIsMe) const PopupMenuItem( value: 'replace', child: Text('Заменить'), ), - if (widget.author == null) + if (widget.author == null || widget.author!.authorIsMe) const PopupMenuItem( value: 'delete', child: Text('Удалить'), From 82fffec5f5fb1eb938c3a007d1a7200fc710477d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 13:31:40 +0000 Subject: [PATCH 23/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 8c247e87..20ee9c53 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -104,14 +104,27 @@ jobs: - name: Test run: flutter test + - name: Create key.properties file + run: | + cat > android/key.properties < android/app/my-release-key.jks + - name: Build apk - run: flutter build apk --profile + run: flutter build apk --release - name: Rename and move apk run: | TIMESTAMP=$(TZ=Europe/Moscow date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-profile.apk $APK_NAME + mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME echo "APK build finished $APK_NAME" echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV From 8cd99721127be589dbc63f68993f2baecfc874b7 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 17:14:36 +0300 Subject: [PATCH 24/30] feat(testflight): change to distribution --- .DS_Store | Bin 10244 -> 10244 bytes ios/Runner.xcodeproj/project.pbxproj | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.DS_Store b/.DS_Store index 097b747a3befbb4b0b1709860d28a9e8dc21a8f5..31ef8af3860347abc958d07f17c7576a3f66fe81 100644 GIT binary patch delta 37 tcmZn(XbG6$&uFUkbiOnhkTRAr8OU+>2*f5Q8GrPiHb^!L_4Fv!I delta 234 zcmZn(XbG6$&*-o*U^hRb!{h`3iOnhkTRDtb8Il-E88R7i7*afQ@{^Nt@{<@C7z7v? zn9>;-82SE#0Z@d20j_fL6`_{NOQc-u;UWwvIq8PM$@#ejAcfhN54=TI&ybRv@8SYA sndAHQH&<88JLZV4B87m8f((QWx%)x(@F1MTkh1xd#B$cn> Date: Mon, 12 May 2025 17:17:30 +0300 Subject: [PATCH 25/30] feat(testflight): ci/cd --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4ae30ed9..2ebee285 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -387,7 +387,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; @@ -409,7 +409,7 @@ MARKETING_VERSION = 1.0.50; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -537,7 +537,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; @@ -559,7 +559,7 @@ MARKETING_VERSION = 1.0.50; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -575,7 +575,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; @@ -597,7 +597,7 @@ MARKETING_VERSION = 1.0.50; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; From dca32573867240e8c945c717c171d7b50351bd1f Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 14:36:41 +0000 Subject: [PATCH 26/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 5d7e74ae..871df3f0 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -19,7 +19,7 @@ jobs: flutter pub run build_runner build --delete-conflicting-outputs cd ios pod update - fastlane beta + sudo fastlane beta env: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 From 21e8a7cedfbaf66849074c9404411cdb8d2368a0 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 14:37:57 +0000 Subject: [PATCH 27/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 871df3f0..5d7e74ae 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -19,7 +19,7 @@ jobs: flutter pub run build_runner build --delete-conflicting-outputs cd ios pod update - sudo fastlane beta + fastlane beta env: LANG: en_US.UTF-8 LC_ALL: en_US.UTF-8 From cdfd2769f03d929e30103191dcd92da09db2badd Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 14:43:35 +0000 Subject: [PATCH 28/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 5d7e74ae..60fe9d9d 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -11,6 +11,12 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Unlock login keychain + run: | + security unlock-keychain -p "$KEYCHAIN_PASSWORD" /Users/runner/Library/Keychains/login.keychain-db + env: + KEYCHAIN_PASSWORD: EeChahboo9Ei + - name: Flutter build run: | flutter clean From 592919600455428b6f5f47fead14851950e5ad23 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 14:44:17 +0000 Subject: [PATCH 29/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test-flight-cd.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test-flight-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml index 60fe9d9d..fd22ac2f 100644 --- a/.gitea/workflows/test-flight-cd.yaml +++ b/.gitea/workflows/test-flight-cd.yaml @@ -13,7 +13,7 @@ jobs: - name: Unlock login keychain run: | - security unlock-keychain -p "$KEYCHAIN_PASSWORD" /Users/runner/Library/Keychains/login.keychain-db + security unlock-keychain -p "$KEYCHAIN_PASSWORD" /Users/gitea_runner_ci/Library/Keychains/login.keychain-db env: KEYCHAIN_PASSWORD: EeChahboo9Ei From ef53ad45d6841f25d06ebff4313a03ee2c49d5aa Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 12 May 2025 14:44:44 +0000 Subject: [PATCH 30/30] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20ios/fastlane/Fastfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 4c53abd3..4073b355 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :ios do lane :beta do match(type: "appstore") increment_build_number(xcodeproj: "Runner.xcodeproj") - build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store") + build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store", codesigning_identity: "Apple Distribution") upload_to_testflight end end