From eb8f6af66bc05c7094700da8fdce678d66ff2c46 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Wed, 20 Nov 2024 21:21:20 +0100 Subject: [PATCH 01/58] chore: add ci for release --- .github/workflows/release.yml | 133 +++++++++++++++++++++++++++------- Gemfile | 4 + android/fastlane/Fastfile | 25 +++++++ fastlane/Fastfile | 35 +++++++++ ios/fastlane/Fastfile | 36 +++++++++ 5 files changed, 208 insertions(+), 25 deletions(-) create mode 100644 android/fastlane/Fastfile create mode 100644 fastlane/Fastfile create mode 100644 ios/fastlane/Fastfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 524303b..031a25f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,46 +1,129 @@ -name: Release +name: Release Workflow on: - push: - branches: - - main + workflow_dispatch: + inputs: + version_type: + description: "Type of version bump (major, minor, patch, premajor, preminor, prepatch, prerelease)" + required: true + default: "patch" + type: choice + options: + - major + - minor + - patch + - premajor + - preminor + - prepatch + - prerelease jobs: - release: + # Job 1: Version Bumping and Android Build + build_android: runs-on: ubuntu-latest + steps: - # Step 1: Check out the repository - - name: Check out code + # Step 1: Checkout the code + - name: Checkout code uses: actions/checkout@v3 # Step 2: Set up Node.js - name: Set up Node.js uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '20.18.0' # Use the specified Node.js version + cache: 'yarn' - # Step 3: Install dependencies + # Step 3: Install dependencies using Yarn - name: Install dependencies run: yarn install - # Step 4: Run release-please to create a release PR with version bump and changelog - - name: Run release-please - uses: google-github-actions/release-please-action@v3 + # Step 4: Set up Ruby and Bundler + - name: Set up Ruby + uses: ruby/setup-ruby@v1 with: - release-type: node - package-name: your-app-name + bundler-cache: true - # Step 5: Sync iOS and Android versions using react-native-version - - name: Sync iOS and Android versions - run: | - CURRENT_VERSION=$(cat package.json | grep version | head -n 1 | awk -F: '{ print $2 }' | sed 's/[",]//g') - yarn react-native-version --target $CURRENT_VERSION + # Step 5: Bump version using Fastlane + - name: Bump version + run: bundle exec fastlane bump_version version_type=${{ github.event.inputs.version_type }} - # Step 6: Commit the iOS and Android version bumps - - name: Commit version updates + # Step 6: Commit and push version changes + - name: Commit and push version changes + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "GitHub Actions" + git config user.name "GitHub Actions" + git config user.email "actions@github.com" git add . - git commit -m "chore(release): sync iOS and Android versions" - git push origin main + git commit -m "Bump version to $(cat .version)" + git push + + # Step 7: Set up Android Keystore + - name: Set up Android Keystore + run: | + echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/keystore.jks + + # Step 8: Build and upload Android app to Alpha track + - name: Build and upload Android app + working-directory: android + env: + SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }} + KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} + GRADLE_USER_HOME: ${{ runner.temp }}/.gradle + run: bundle exec fastlane release_android_alpha + + # Step 9: Upload artifacts for iOS job + - name: Upload code for iOS build + uses: actions/upload-artifact@v3 + with: + name: source-code + path: . + retention-days: 1 + + # Job 2: iOS Build and Upload (runs on macOS) + build_ios: + runs-on: macos-latest + needs: build_android + + steps: + # Step 1: Download code from previous job + - name: Download code + uses: actions/download-artifact@v3 + with: + name: source-code + path: . + + # Step 2: Set up Node.js + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '20.18.0' + cache: 'yarn' + + # Step 3: Install dependencies using Yarn + - name: Install dependencies + run: yarn install + + # Step 4: Set up Ruby and Bundler + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + # Step 5: Install CocoaPods dependencies + - name: Install CocoaPods dependencies + working-directory: ios + run: pod install + + # Step 6: Build and upload iOS app to TestFlight + - name: Build and upload iOS app + working-directory: ios + env: + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }} + APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }} + APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }} + run: bundle exec fastlane release_ios diff --git a/Gemfile b/Gemfile index 4ab0b02..0e319f4 100644 --- a/Gemfile +++ b/Gemfile @@ -7,3 +7,7 @@ ruby "3.2.3" # bound in the template on Cocoapods with next React Native release. gem 'cocoapods', '>= 1.13', '< 1.15' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' + +# Fastlane +gem "fastlane" +gem "fastlane-plugin-versioning" \ No newline at end of file diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile new file mode 100644 index 0000000..e13aa5b --- /dev/null +++ b/android/fastlane/Fastfile @@ -0,0 +1,25 @@ +default_platform :android + +platform :android do + desc "Release Android app to Alpha track" + lane :release_android_alpha do + gradle( + task: "bundle", + build_type: "Release", + properties: { + "android.injected.signing.store.file" => "../keystore.jks", + "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], + "android.injected.signing.key.alias" => ENV["KEY_ALIAS"], + "android.injected.signing.key.password" => ENV["KEY_PASSWORD"] + } + ) + + upload_to_play_store( + track: "alpha", + json_key_data: ENV["SUPPLY_JSON_KEY_DATA"], + skip_upload_metadata: true, + skip_upload_images: true, + skip_upload_screenshots: true + ) + end +end diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..14d8f5b --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,35 @@ + +desc "Bump version for both Android and iOS" +lane :bump_version do |options| + version_type = options[:version_type] || "patch" # Default to "patch" if not provided + + # Bump version in package.json using Yarn + begin + new_version = sh("yarn version --#{version_type} --no-git-tag-version").strip.match(/"version": "(.*?)"/)[1] + rescue => e + UI.error("Failed to bump version: #{e.message}") + raise + end + sh("echo #{new_version} > .version") + + # Bump iOS version + increment_version_number(version_number: new_version) + increment_build_number + + # Bump Android version + gradle_file = "./android/app/build.gradle" + android_version_code = get_version_code_from_gradle(gradle_file: gradle_file).to_i + 1 + android_version_name = new_version + update_gradle_property( + property: "versionCode", + value: android_version_code.to_s, + gradle_file: gradle_file + ) + update_gradle_property( + property: "versionName", + value: "\"#{android_version_name}\"", + gradle_file: gradle_file + ) + + UI.message("Bumped version to #{new_version}") +end diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile new file mode 100644 index 0000000..03d6ffe --- /dev/null +++ b/ios/fastlane/Fastfile @@ -0,0 +1,36 @@ +default_platform :ios + +platform :ios do + desc "Release iOS app to TestFlight" + lane :release_ios do + api_key = app_store_connect_api_key( + key_id: ENV['APP_STORE_CONNECT_API_KEY_ID'], + issuer_id: ENV['APP_STORE_CONNECT_API_ISSUER_ID'], + key_content: ENV['APP_STORE_CONNECT_API_KEY_CONTENT'].gsub('\\n', "\n"), + in_house: false + ) + + match( + type: "appstore", + readonly: false, + api_key: api_key, + git_branch: "master", + password: ENV['MATCH_PASSWORD'] + ) + + build_ios_app( + scheme: "PocketPal", # Replace with your app's scheme + export_method: "app-store", + output_directory: "./build", + clean: true + ) + + upload_to_testflight( + api_key: api_key, + skip_waiting_for_build_processing: false + wait_processing_interval: 60, # Check every minute + wait_for_uploaded_build: true, + wait_processing_timeout_duration: 1800 # 30 minutes timeout + ) + end +end From af181956cccf67ec8891d69314fd799cf9ec24a9 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 17:56:06 +0100 Subject: [PATCH 02/58] chore: update ci - integrate Identity Federation authentication --- .github/workflows/release.yml | 15 ++++++++++++--- android/fastlane/Fastfile | 1 - 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 031a25f..567306b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,9 @@ jobs: # Job 1: Version Bumping and Android Build build_android: runs-on: ubuntu-latest + permissions: + contents: 'read' # Allows workflow to checkout repository code + id-token: 'write' # Required for Google Cloud Workload Identity Federation authentication (OIDC token generation) steps: # Step 1: Checkout the code @@ -64,18 +67,24 @@ jobs: run: | echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/keystore.jks - # Step 8: Build and upload Android app to Alpha track + # Step 8: Authenticate to Google Cloud + - name: Authenticate to Google Cloud + uses: google-github-actions/auth@v2 + with: + workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} + service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} + + # Step 9: Build and upload Android app to Alpha track - name: Build and upload Android app working-directory: android env: - SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }} KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} GRADLE_USER_HOME: ${{ runner.temp }}/.gradle run: bundle exec fastlane release_android_alpha - # Step 9: Upload artifacts for iOS job + # Step 10: Upload the entire project directory for use in the iOS job - name: Upload code for iOS build uses: actions/upload-artifact@v3 with: diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index e13aa5b..23d1d83 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -16,7 +16,6 @@ platform :android do upload_to_play_store( track: "alpha", - json_key_data: ENV["SUPPLY_JSON_KEY_DATA"], skip_upload_metadata: true, skip_upload_images: true, skip_upload_screenshots: true From ccb40fc7f1029d3dc37d1e32b4272db390645ab8 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 18:47:48 +0100 Subject: [PATCH 03/58] chore: test ci --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 567306b..8a50a47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,14 @@ on: - preminor - prepatch - prerelease + push: + branches: + - ci/test + paths-ignore: # Don't trigger on version-related files + - '.version' + - 'package.json' + - 'android/app/build.gradle' + - 'ios/**/Info.plist' jobs: # Job 1: Version Bumping and Android Build From 26508fadecbc9591992811a3358d542ed49b90d3 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 18:56:27 +0100 Subject: [PATCH 04/58] chore(ci): specify ruby version --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a50a47..b163f57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,6 +53,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: + ruby-version: '3.2.3' # Specify a Ruby version bundler-cache: true # Step 5: Bump version using Fastlane @@ -128,6 +129,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: + ruby-version: '3.2.3' # Specify a Ruby version bundler-cache: true # Step 5: Install CocoaPods dependencies From b84271df78c37d6d8ac196670d3085740fcc3912 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 19:03:20 +0100 Subject: [PATCH 05/58] chore: add Ruby dependencies --- Gemfile.lock | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index e714bcc..9c9634d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,25 @@ GEM algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) + artifactory (3.0.17) atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.1013.0) + aws-sdk-core (3.214.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.174.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) base64 (0.2.0) claide (1.1.0) cocoapods (1.14.3) @@ -55,32 +73,196 @@ GEM nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) + colored (1.2) colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) concurrent-ruby (1.2.3) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.225.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-versioning (0.7.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.7) + domain_name (~> 0.5) httpclient (2.8.3) i18n (1.14.4) concurrent-ruby (~> 1.0) + jmespath (1.6.2) json (2.7.2) + jwt (2.9.3) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) minitest (5.22.3) molinillo (0.8.0) + multi_json (1.15.0) + multipart-post (2.4.1) nanaimo (0.3.0) nap (1.1.0) + naturally (2.2.1) netrc (0.11.0) nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.1) public_suffix (4.0.7) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) rexml (3.2.6) + rouge (2.0.7) ruby-macho (2.5.1) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) @@ -88,6 +270,10 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) PLATFORMS ruby @@ -95,6 +281,8 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, < 7.1.0) cocoapods (>= 1.13, < 1.15) + fastlane + fastlane-plugin-versioning RUBY VERSION ruby 3.2.3p157 From dc411bcabf10041ed33334ef75cf89173055b4b8 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 19:14:57 +0100 Subject: [PATCH 06/58] chore(ci): add 'patch' as default for version bump --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b163f57..ecd5e54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: # Step 5: Bump version using Fastlane - name: Bump version - run: bundle exec fastlane bump_version version_type=${{ github.event.inputs.version_type }} + run: bundle exec fastlane bump_version version_type=${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} # Step 6: Commit and push version changes - name: Commit and push version changes From 722cfa5d201c9e711f92a4de677d6e6890542404 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 19:19:32 +0100 Subject: [PATCH 07/58] fix(ci): fix bump version fastlane --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ecd5e54..08fd462 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: # Step 5: Bump version using Fastlane - name: Bump version - run: bundle exec fastlane bump_version version_type=${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} + run: bundle exec fastlane bump_version version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} # Step 6: Commit and push version changes - name: Commit and push version changes From aa16a1a7f91f06a58e99a314c1f1680af981eea0 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 19:32:54 +0100 Subject: [PATCH 08/58] fix(ci): update version bump parsing in Fastfile --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 14d8f5b..0fb8e59 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,16 +1,16 @@ - desc "Bump version for both Android and iOS" lane :bump_version do |options| version_type = options[:version_type] || "patch" # Default to "patch" if not provided # Bump version in package.json using Yarn begin - new_version = sh("yarn version --#{version_type} --no-git-tag-version").strip.match(/"version": "(.*?)"/)[1] + output = sh("yarn version --#{version_type} --no-git-tag-version") + new_version = output.match(/New version: (.+)$/)[1] + sh("echo #{new_version} > .version") rescue => e UI.error("Failed to bump version: #{e.message}") raise end - sh("echo #{new_version} > .version") # Bump iOS version increment_version_number(version_number: new_version) From 2b87395b7a5ded2a0290d68c13cffc9d72864134 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 20:11:31 +0100 Subject: [PATCH 09/58] chore(ci): imporve ci --- .github/workflows/release.yml | 34 +++++++++++++++++++++------------- fastlane/Fastfile | 7 +++---- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08fd462..0ecd40c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: build_android: runs-on: ubuntu-latest permissions: - contents: 'read' # Allows workflow to checkout repository code + contents: 'write' # Allows workflow to checkout repository code id-token: 'write' # Required for Google Cloud Workload Identity Federation authentication (OIDC token generation) steps: @@ -67,9 +67,11 @@ jobs: run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" - git add . + git add .version package.json android/app/build.gradle ios/**/Info.plist git commit -m "Bump version to $(cat .version)" git push + git tag "v$(cat .version)" + git push origin "v$(cat .version)" # Step 7: Set up Android Keystore - name: Set up Android Keystore @@ -94,12 +96,12 @@ jobs: run: bundle exec fastlane release_android_alpha # Step 10: Upload the entire project directory for use in the iOS job - - name: Upload code for iOS build - uses: actions/upload-artifact@v3 - with: - name: source-code - path: . - retention-days: 1 + # - name: Upload code for iOS build + # uses: actions/upload-artifact@v3 + # with: + # name: source-code + # path: . + # retention-days: 1 # Job 2: iOS Build and Upload (runs on macOS) build_ios: @@ -107,12 +109,18 @@ jobs: needs: build_android steps: - # Step 1: Download code from previous job - - name: Download code - uses: actions/download-artifact@v3 + - name: Checkout code # Replace the Download code step + uses: actions/checkout@v3 with: - name: source-code - path: . + ref: ${{ github.ref }} # This ensures we get the latest changes including the version bump + + # steps: + # # Step 1: Download code from previous job + # - name: Download code + # uses: actions/download-artifact@v3 + # with: + # name: source-code + # path: . # Step 2: Set up Node.js - name: Set up Node.js diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 0fb8e59..6da53ba 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -4,12 +4,11 @@ lane :bump_version do |options| # Bump version in package.json using Yarn begin - output = sh("yarn version --#{version_type} --no-git-tag-version") - new_version = output.match(/New version: (.+)$/)[1] + sh("yarn version --#{version_type} --no-git-tag-version") + new_version = JSON.parse(File.read('package.json'))['version'] sh("echo #{new_version} > .version") rescue => e - UI.error("Failed to bump version: #{e.message}") - raise + UI.user_error!("Failed to bump version: #{e.message}") end # Bump iOS version From 2a7e9730d7de0af5a3cb366b63162b23c21cbcc0 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 20:19:30 +0100 Subject: [PATCH 10/58] fix(ci): separate android and ios version bump --- .github/workflows/release.yml | 35 +++++++++++++++++++++++--------- fastlane/Fastfile | 38 +++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ecd40c..14c3b75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,22 +56,20 @@ jobs: ruby-version: '3.2.3' # Specify a Ruby version bundler-cache: true - # Step 5: Bump version using Fastlane - - name: Bump version - run: bundle exec fastlane bump_version version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} + # Step 5: Bump Android version + - name: Bump Android version + run: bundle exec fastlane bump_version_android version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} - # Step 6: Commit and push version changes - - name: Commit and push version changes + # Step 6: Commit and push Android version changes + - name: Commit and push Android version changes env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" - git add .version package.json android/app/build.gradle ios/**/Info.plist - git commit -m "Bump version to $(cat .version)" + git add .version package.json android/app/build.gradle + git commit -m "Bump Android version to $(cat .version)" git push - git tag "v$(cat .version)" - git push origin "v$(cat .version)" # Step 7: Set up Android Keystore - name: Set up Android Keystore @@ -145,7 +143,24 @@ jobs: working-directory: ios run: pod install - # Step 6: Build and upload iOS app to TestFlight + # Step 6: Bump iOS version + - name: Bump iOS version + run: bundle exec fastlane bump_version_ios + + # Step 7: Commit, push, and tag iOS version changes + - name: Commit, push, and tag iOS version changes + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git add ios/**/Info.plist + git commit -m "Bump iOS version to $(cat .version)" + git push + git tag "v$(cat .version)" + git push origin "v$(cat .version)" + + # Step 8: Build and upload iOS app to TestFlight - name: Build and upload iOS app working-directory: ios env: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6da53ba..075ea7c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,24 +1,16 @@ -desc "Bump version for both Android and iOS" -lane :bump_version do |options| - version_type = options[:version_type] || "patch" # Default to "patch" if not provided +desc "Bump version for Android" +lane :bump_version_android do |options| + version_type = options[:version_type] || "patch" # Bump version in package.json using Yarn - begin - sh("yarn version --#{version_type} --no-git-tag-version") - new_version = JSON.parse(File.read('package.json'))['version'] - sh("echo #{new_version} > .version") - rescue => e - UI.user_error!("Failed to bump version: #{e.message}") - end - - # Bump iOS version - increment_version_number(version_number: new_version) - increment_build_number + sh("yarn version --#{version_type} --no-git-tag-version") + new_version = JSON.parse(File.read('package.json'))['version'] + sh("echo #{new_version} > .version") # Bump Android version gradle_file = "./android/app/build.gradle" android_version_code = get_version_code_from_gradle(gradle_file: gradle_file).to_i + 1 - android_version_name = new_version + update_gradle_property( property: "versionCode", value: android_version_code.to_s, @@ -26,9 +18,21 @@ lane :bump_version do |options| ) update_gradle_property( property: "versionName", - value: "\"#{android_version_name}\"", + value: "\"#{new_version}\"", gradle_file: gradle_file ) - UI.message("Bumped version to #{new_version}") + UI.message("Bumped Android version to #{new_version}") +end + +desc "Bump version for iOS" +lane :bump_version_ios do |options| + # Read the version from package.json + new_version = JSON.parse(File.read('package.json'))['version'] + + # Bump iOS version + increment_version_number(version_number: new_version) + increment_build_number + + UI.message("Bumped iOS version to #{new_version}") end From 598fa3c6d2637d8d0430301e9e5c640ea61756d8 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 20:32:22 +0100 Subject: [PATCH 11/58] fix(ci): fix bump version issue --- .github/workflows/release.yml | 2 ++ fastlane/Fastfile | 40 +++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14c3b75..948e80a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,7 @@ jobs: # Step 5: Bump Android version - name: Bump Android version + working-directory: ${{ github.workspace }} run: bundle exec fastlane bump_version_android version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} # Step 6: Commit and push Android version changes @@ -145,6 +146,7 @@ jobs: # Step 6: Bump iOS version - name: Bump iOS version + working-directory: ${{ github.workspace }} run: bundle exec fastlane bump_version_ios # Step 7: Commit, push, and tag iOS version changes diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 075ea7c..04350e9 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,14 +1,29 @@ desc "Bump version for Android" lane :bump_version_android do |options| + # Debugging statements + sh("echo 'Current directory: ' $(pwd)") + sh("ls -la") + version_type = options[:version_type] || "patch" + root_dir = File.expand_path('..', Dir.pwd) + + # More debugging + UI.message("Root directory: #{root_dir}") + sh("echo 'Root directory contents:'") + sh("ls -la #{root_dir}") - # Bump version in package.json using Yarn - sh("yarn version --#{version_type} --no-git-tag-version") - new_version = JSON.parse(File.read('package.json'))['version'] - sh("echo #{new_version} > .version") + package_json_path = File.join(root_dir, 'package.json') + version_file_path = File.join(root_dir, '.version') + + Dir.chdir(root_dir) do + sh("yarn version --#{version_type} --no-git-tag-version") + end + + new_version = JSON.parse(File.read(package_json_path))['version'] + sh("echo #{new_version} > #{version_file_path}") # Bump Android version - gradle_file = "./android/app/build.gradle" + gradle_file = File.join(root_dir, "android/app/build.gradle") android_version_code = get_version_code_from_gradle(gradle_file: gradle_file).to_i + 1 update_gradle_property( @@ -27,8 +42,21 @@ end desc "Bump version for iOS" lane :bump_version_ios do |options| + # Debugging statements + sh("echo 'Current directory: ' $(pwd)") + sh("ls -la") + + root_dir = File.expand_path('..', Dir.pwd) + + # More debugging + UI.message("Root directory: #{root_dir}") + sh("echo 'Root directory contents:'") + sh("ls -la #{root_dir}") + + package_json_path = File.join(root_dir, 'package.json') + # Read the version from package.json - new_version = JSON.parse(File.read('package.json'))['version'] + new_version = JSON.parse(File.read(package_json_path))['version'] # Bump iOS version increment_version_number(version_number: new_version) From b7c461d5712e9b78b02c63bce7d8f22133a8962c Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 20:54:18 +0100 Subject: [PATCH 12/58] fix(ci): update android ver bump --- Gemfile | 3 ++- Gemfile.lock | 2 ++ fastlane/Fastfile | 28 +++++++++++----------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 0e319f4..4810d8a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,4 +10,5 @@ gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' # Fastlane gem "fastlane" -gem "fastlane-plugin-versioning" \ No newline at end of file +gem "fastlane-plugin-versioning" +gem 'fastlane-plugin-versioning_android' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 9c9634d..d658379 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,6 +160,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-versioning (0.7.0) + fastlane-plugin-versioning_android (0.1.1) fastlane-sirp (1.0.0) sysrandom (~> 1.0) ffi (1.16.3) @@ -283,6 +284,7 @@ DEPENDENCIES cocoapods (>= 1.13, < 1.15) fastlane fastlane-plugin-versioning + fastlane-plugin-versioning_android RUBY VERSION ruby 3.2.3p157 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 04350e9..3f9fe3e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,17 +1,8 @@ desc "Bump version for Android" lane :bump_version_android do |options| - # Debugging statements - sh("echo 'Current directory: ' $(pwd)") - sh("ls -la") - version_type = options[:version_type] || "patch" root_dir = File.expand_path('..', Dir.pwd) - # More debugging - UI.message("Root directory: #{root_dir}") - sh("echo 'Root directory contents:'") - sh("ls -la #{root_dir}") - package_json_path = File.join(root_dir, 'package.json') version_file_path = File.join(root_dir, '.version') @@ -24,17 +15,20 @@ lane :bump_version_android do |options| # Bump Android version gradle_file = File.join(root_dir, "android/app/build.gradle") - android_version_code = get_version_code_from_gradle(gradle_file: gradle_file).to_i + 1 - update_gradle_property( - property: "versionCode", - value: android_version_code.to_s, + # Get current version code and increment it + current_version_code = android_get_version_code( gradle_file: gradle_file ) - update_gradle_property( - property: "versionName", - value: "\"#{new_version}\"", - gradle_file: gradle_file + + android_set_version_code( + gradle_file: gradle_file, + version_code: current_version_code + 1 + ) + + android_set_version_name( + gradle_file: gradle_file, + version_name: new_version ) UI.message("Bumped Android version to #{new_version}") From 1bad72c89295681deb63d5d79fe5ae856687fdc3 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 20:59:47 +0100 Subject: [PATCH 13/58] fix(ci): android version bump --- fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3f9fe3e..b0acfe4 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,10 +20,11 @@ lane :bump_version_android do |options| current_version_code = android_get_version_code( gradle_file: gradle_file ) + new_version_code = (current_version_code.to_i + 1).to_s android_set_version_code( gradle_file: gradle_file, - version_code: current_version_code + 1 + version_code: new_version_code ) android_set_version_name( From a71803fd8bc168cd2123df531e535673ff39458e Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 21:41:35 +0100 Subject: [PATCH 14/58] fix(ci): update bump version ios --- fastlane/Fastfile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b0acfe4..64f1720 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,25 +37,26 @@ end desc "Bump version for iOS" lane :bump_version_ios do |options| - # Debugging statements - sh("echo 'Current directory: ' $(pwd)") - sh("ls -la") - root_dir = File.expand_path('..', Dir.pwd) + ios_dir = File.join(root_dir, 'ios') - # More debugging - UI.message("Root directory: #{root_dir}") - sh("echo 'Root directory contents:'") - sh("ls -la #{root_dir}") - package_json_path = File.join(root_dir, 'package.json') # Read the version from package.json new_version = JSON.parse(File.read(package_json_path))['version'] - # Bump iOS version - increment_version_number(version_number: new_version) - increment_build_number + # Change to iOS directory for version bumping + Dir.chdir(ios_dir) do + # Bump iOS version + increment_version_number_in_xcodeproj( + version_number: new_version, + xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") + ) + increment_build_number_in_xcodeproj( + build_number: Time.now.strftime("%Y%m%d%H%M"), + xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") + ) + end UI.message("Bumped iOS version to #{new_version}") end From 10399cba96245aeea7f25d378b43c5f331ae6955 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 21:49:35 +0100 Subject: [PATCH 15/58] chore(ci): combine ios and android version bump --- .github/workflows/release.yml | 36 ++++++++++------------------------ fastlane/Fastfile | 37 +++++++++++------------------------ 2 files changed, 21 insertions(+), 52 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 948e80a..8e77e8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,21 +56,23 @@ jobs: ruby-version: '3.2.3' # Specify a Ruby version bundler-cache: true - # Step 5: Bump Android version - - name: Bump Android version + # Combined version bump + - name: Bump versions working-directory: ${{ github.workspace }} - run: bundle exec fastlane bump_version_android version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} + run: bundle exec fastlane bump_version version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} - # Step 6: Commit and push Android version changes - - name: Commit and push Android version changes + # Commit all version changes + - name: Commit and push version changes env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" - git add .version package.json android/app/build.gradle - git commit -m "Bump Android version to $(cat .version)" + git add .version package.json android/app/build.gradle ios/PocketPal.xcodeproj/project.pbxproj + git commit -m "Bump version to $(cat .version)" git push + git tag "v$(cat .version)" + git push origin "v$(cat .version)" # Step 7: Set up Android Keystore - name: Set up Android Keystore @@ -144,25 +146,7 @@ jobs: working-directory: ios run: pod install - # Step 6: Bump iOS version - - name: Bump iOS version - working-directory: ${{ github.workspace }} - run: bundle exec fastlane bump_version_ios - - # Step 7: Commit, push, and tag iOS version changes - - name: Commit, push, and tag iOS version changes - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git add ios/**/Info.plist - git commit -m "Bump iOS version to $(cat .version)" - git push - git tag "v$(cat .version)" - git push origin "v$(cat .version)" - - # Step 8: Build and upload iOS app to TestFlight + # Step 6: Build and upload iOS app to TestFlight - name: Build and upload iOS app working-directory: ios env: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 64f1720..6f11180 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,11 +1,13 @@ -desc "Bump version for Android" -lane :bump_version_android do |options| +desc "Bump version for both Android and iOS" +lane :bump_version do |options| version_type = options[:version_type] || "patch" root_dir = File.expand_path('..', Dir.pwd) + # Common paths package_json_path = File.join(root_dir, 'package.json') version_file_path = File.join(root_dir, '.version') + # Bump version in package.json Dir.chdir(root_dir) do sh("yarn version --#{version_type} --no-git-tag-version") end @@ -13,18 +15,14 @@ lane :bump_version_android do |options| new_version = JSON.parse(File.read(package_json_path))['version'] sh("echo #{new_version} > #{version_file_path}") + # Generate common build number based on timestamp + build_number = Time.now.strftime("%Y%m%d%H%M") + # Bump Android version gradle_file = File.join(root_dir, "android/app/build.gradle") - - # Get current version code and increment it - current_version_code = android_get_version_code( - gradle_file: gradle_file - ) - new_version_code = (current_version_code.to_i + 1).to_s - android_set_version_code( gradle_file: gradle_file, - version_code: new_version_code + version_code: build_number ) android_set_version_name( @@ -32,31 +30,18 @@ lane :bump_version_android do |options| version_name: new_version ) - UI.message("Bumped Android version to #{new_version}") -end - -desc "Bump version for iOS" -lane :bump_version_ios do |options| - root_dir = File.expand_path('..', Dir.pwd) + # Bump iOS version ios_dir = File.join(root_dir, 'ios') - - package_json_path = File.join(root_dir, 'package.json') - - # Read the version from package.json - new_version = JSON.parse(File.read(package_json_path))['version'] - - # Change to iOS directory for version bumping Dir.chdir(ios_dir) do - # Bump iOS version increment_version_number_in_xcodeproj( version_number: new_version, xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") ) increment_build_number_in_xcodeproj( - build_number: Time.now.strftime("%Y%m%d%H%M"), + build_number: build_number, xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") ) end - UI.message("Bumped iOS version to #{new_version}") + UI.message("Bumped Android and iOS versions to #{new_version}") end From de2f3622072c11393d29b056e750d2762b30969c Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Tue, 26 Nov 2024 21:55:41 +0100 Subject: [PATCH 16/58] fix(ci): add title to commit in push version changes --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e77e8c..9b63bf0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: git config user.name "GitHub Actions" git config user.email "actions@github.com" git add .version package.json android/app/build.gradle ios/PocketPal.xcodeproj/project.pbxproj - git commit -m "Bump version to $(cat .version)" + git commit -m "chore(release): bump version to $(cat .version)" git push git tag "v$(cat .version)" git push origin "v$(cat .version)" From dd12e01e54ed0c210af104318e3b892952a3b931 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 26 Nov 2024 20:56:39 +0000 Subject: [PATCH 17/58] chore(release): bump version to 1.5.1 --- .version | 1 + android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 22 ++++++++++++++++------ package.json | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 .version diff --git a/.version b/.version new file mode 100644 index 0000000..26ca594 --- /dev/null +++ b/.version @@ -0,0 +1 @@ +1.5.1 diff --git a/android/app/build.gradle b/android/app/build.gradle index 2810bf3..00b0c98 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14 - versionName "1.5.0" + versionCode 202411262056 + versionName "1.5.1" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 7b68282..b1286b3 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,6 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 202411262056; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -437,6 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -454,6 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 202411262056; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -462,6 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -479,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 202411262056; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -488,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -521,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 202411262056; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -529,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -624,7 +628,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -692,7 +699,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/package.json b/package.json index 161cbd5..0f441fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.0", + "version": "1.5.1", "private": true, "scripts": { "prepare": "husky", From b3f77d1c8035155bbbcc9682cc64a4a16723f1c3 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Wed, 27 Nov 2024 17:38:05 +0100 Subject: [PATCH 18/58] chore(ci): update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b63bf0..ec077b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: steps: # Step 1: Checkout the code - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Step 2: Set up Node.js - name: Set up Node.js @@ -83,8 +83,8 @@ jobs: - name: Authenticate to Google Cloud uses: google-github-actions/auth@v2 with: - workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} + workload_identity_provider: "${{ secrets.WORKLOAD_IDENTITY_PROVIDER }}" # Step 9: Build and upload Android app to Alpha track - name: Build and upload Android app From 61bcbbea00c96a67c0c4a26e1a15c8d92d0ed27e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Nov 2024 16:49:28 +0000 Subject: [PATCH 19/58] chore(release): bump version to 1.5.2 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 26ca594..4cda8f1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.1 +1.5.2 diff --git a/android/app/build.gradle b/android/app/build.gradle index 00b0c98..275ad18 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 202411262056 - versionName "1.5.1" + versionCode 202411271649 + versionName "1.5.2" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index b1286b3..b85466b 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 202411262056; + CURRENT_PROJECT_VERSION = 202411271649; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 202411262056; + CURRENT_PROJECT_VERSION = 202411271649; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411262056; + CURRENT_PROJECT_VERSION = 202411271649; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411262056; + CURRENT_PROJECT_VERSION = 202411271649; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 0f441fb..2b1253e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.1", + "version": "1.5.2", "private": true, "scripts": { "prepare": "husky", From f6b1551d80511cdfcbf6fe6f14a35faeb1a5ea5d Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Wed, 27 Nov 2024 20:48:16 +0100 Subject: [PATCH 20/58] chore(ci): update release.tml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec077b3..b46f380 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,7 +84,7 @@ jobs: uses: google-github-actions/auth@v2 with: service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} - workload_identity_provider: "${{ secrets.WORKLOAD_IDENTITY_PROVIDER }}" + workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} # Step 9: Build and upload Android app to Alpha track - name: Build and upload Android app From 9ff5811909bc2194773c5c8ebceef75a12c5af59 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Nov 2024 19:49:44 +0000 Subject: [PATCH 21/58] chore(release): bump version to 1.5.3 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 4cda8f1..8af85be 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.2 +1.5.3 diff --git a/android/app/build.gradle b/android/app/build.gradle index 275ad18..f79054f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 202411271649 - versionName "1.5.2" + versionCode 202411271949 + versionName "1.5.3" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index b85466b..de153fc 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 202411271649; + CURRENT_PROJECT_VERSION = 202411271949; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.2; + MARKETING_VERSION = 1.5.3; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 202411271649; + CURRENT_PROJECT_VERSION = 202411271949; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.2; + MARKETING_VERSION = 1.5.3; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271649; + CURRENT_PROJECT_VERSION = 202411271949; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.2; + MARKETING_VERSION = 1.5.3; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271649; + CURRENT_PROJECT_VERSION = 202411271949; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.2; + MARKETING_VERSION = 1.5.3; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 2b1253e..41446c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.2", + "version": "1.5.3", "private": true, "scripts": { "prepare": "husky", From 89ebe52b83d24ec6e2ac719a18c916d35adba7fc Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Wed, 27 Nov 2024 20:56:00 +0100 Subject: [PATCH 22/58] chore(ci): add java17 --- .github/workflows/release.yml | 40 ++++++++++++++--------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b46f380..8e4b14a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,7 @@ on: - 'package.json' - 'android/app/build.gradle' - 'ios/**/Info.plist' + - 'ios/PocketPal.xcodeproj/project.pbxproj' jobs: # Job 1: Version Bumping and Android Build @@ -38,30 +39,37 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - # Step 2: Set up Node.js + # Step 2: Set up JDK 17 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + # Step 3: Set up Node.js - name: Set up Node.js uses: actions/setup-node@v3 with: node-version: '20.18.0' # Use the specified Node.js version cache: 'yarn' - # Step 3: Install dependencies using Yarn + # Step 4: Install dependencies using Yarn - name: Install dependencies run: yarn install - # Step 4: Set up Ruby and Bundler + # Step 5: Set up Ruby and Bundler - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: '3.2.3' # Specify a Ruby version bundler-cache: true - # Combined version bump + # Step 6: Combined version bump - name: Bump versions working-directory: ${{ github.workspace }} run: bundle exec fastlane bump_version version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }} - # Commit all version changes + # Step 7: Commit and push version changes - name: Commit and push version changes env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -74,19 +82,19 @@ jobs: git tag "v$(cat .version)" git push origin "v$(cat .version)" - # Step 7: Set up Android Keystore + # Step 8: Set up Android Keystore - name: Set up Android Keystore run: | echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/keystore.jks - # Step 8: Authenticate to Google Cloud + # Step 9: Authenticate to Google Cloud - name: Authenticate to Google Cloud uses: google-github-actions/auth@v2 with: service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} - # Step 9: Build and upload Android app to Alpha track + # Step 10: Build and upload Android app to Alpha track - name: Build and upload Android app working-directory: android env: @@ -96,14 +104,6 @@ jobs: GRADLE_USER_HOME: ${{ runner.temp }}/.gradle run: bundle exec fastlane release_android_alpha - # Step 10: Upload the entire project directory for use in the iOS job - # - name: Upload code for iOS build - # uses: actions/upload-artifact@v3 - # with: - # name: source-code - # path: . - # retention-days: 1 - # Job 2: iOS Build and Upload (runs on macOS) build_ios: runs-on: macos-latest @@ -115,14 +115,6 @@ jobs: with: ref: ${{ github.ref }} # This ensures we get the latest changes including the version bump - # steps: - # # Step 1: Download code from previous job - # - name: Download code - # uses: actions/download-artifact@v3 - # with: - # name: source-code - # path: . - # Step 2: Set up Node.js - name: Set up Node.js uses: actions/setup-node@v3 From 5ba8fb899d58f6fe5c82e97b3c378b6e172a8457 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Nov 2024 19:56:57 +0000 Subject: [PATCH 23/58] chore(release): bump version to 1.5.4 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 8af85be..94fe62c 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.3 +1.5.4 diff --git a/android/app/build.gradle b/android/app/build.gradle index f79054f..f47d80e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 202411271949 - versionName "1.5.3" + versionCode 202411271956 + versionName "1.5.4" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index de153fc..1e8648b 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 202411271949; + CURRENT_PROJECT_VERSION = 202411271956; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.3; + MARKETING_VERSION = 1.5.4; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 202411271949; + CURRENT_PROJECT_VERSION = 202411271956; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.3; + MARKETING_VERSION = 1.5.4; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271949; + CURRENT_PROJECT_VERSION = 202411271956; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.3; + MARKETING_VERSION = 1.5.4; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271949; + CURRENT_PROJECT_VERSION = 202411271956; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.3; + MARKETING_VERSION = 1.5.4; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 41446c3..3adde95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.3", + "version": "1.5.4", "private": true, "scripts": { "prepare": "husky", From 9002685dbfd018c9a9d72763dc5f730eb9268917 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Wed, 27 Nov 2024 21:18:19 +0100 Subject: [PATCH 24/58] chore(ci): fix version code bump --- android/app/build.gradle | 2 +- fastlane/Fastfile | 19 +++++++++++-------- ios/PocketPal.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f47d80e..23c52aa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,7 +81,7 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 202411271956 + versionCode 15 versionName "1.5.4" ndk { abiFilters "arm64-v8a", "x86_64" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6f11180..d4d6792 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -15,14 +15,15 @@ lane :bump_version do |options| new_version = JSON.parse(File.read(package_json_path))['version'] sh("echo #{new_version} > #{version_file_path}") - # Generate common build number based on timestamp - build_number = Time.now.strftime("%Y%m%d%H%M") - - # Bump Android version + # For Android: Read current version code and increment it gradle_file = File.join(root_dir, "android/app/build.gradle") + current_version_code = android_get_version_code(gradle_file: gradle_file).to_i + new_version_code = current_version_code + 1 + + # Update Android version android_set_version_code( gradle_file: gradle_file, - version_code: build_number + version_code: new_version_code ) android_set_version_name( @@ -30,7 +31,7 @@ lane :bump_version do |options| version_name: new_version ) - # Bump iOS version + # For iOS: Bump version and build number ios_dir = File.join(root_dir, 'ios') Dir.chdir(ios_dir) do increment_version_number_in_xcodeproj( @@ -38,10 +39,12 @@ lane :bump_version do |options| xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") ) increment_build_number_in_xcodeproj( - build_number: build_number, xcodeproj: File.join(ios_dir, "PocketPal.xcodeproj") ) end - UI.message("Bumped Android and iOS versions to #{new_version}") + UI.message("Bumped versions:") + UI.message("- Version name: #{new_version}") + UI.message("- Android version code: #{new_version_code}") + UI.message("- iOS build number: #{get_build_number_from_xcodeproj(xcodeproj: File.join(ios_dir, 'PocketPal.xcodeproj'))}") end diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 1e8648b..78e937c 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 202411271956; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 202411271956; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271956; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 202411271956; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; From 1e2469ff400e9b06cdacc00d43b98936ad3bdf07 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Nov 2024 20:19:20 +0000 Subject: [PATCH 25/58] chore(release): bump version to 1.5.5 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 94fe62c..9075be4 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.4 +1.5.5 diff --git a/android/app/build.gradle b/android/app/build.gradle index 23c52aa..803c8c3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 15 - versionName "1.5.4" + versionCode 16 + versionName "1.5.5" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 78e937c..1bd9fb9 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 3adde95..74cea76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.4", + "version": "1.5.5", "private": true, "scripts": { "prepare": "husky", From bb42f6231e28f52010018e0e9e2deae832de5507 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 09:17:05 +0100 Subject: [PATCH 26/58] fix(ci): uses absolute path in fastfile for keystore.jks --- .github/workflows/release.yml | 3 ++- android/fastlane/Fastfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e4b14a..0031265 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,8 +84,9 @@ jobs: # Step 8: Set up Android Keystore - name: Set up Android Keystore + working-directory: android run: | - echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/keystore.jks + echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > keystore.jks # Step 9: Authenticate to Google Cloud - name: Authenticate to Google Cloud diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 23d1d83..bad27ff 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -3,11 +3,12 @@ default_platform :android platform :android do desc "Release Android app to Alpha track" lane :release_android_alpha do + android_dir = Dir.pwd # working-directory in workflow should be set to android for this to work gradle( task: "bundle", build_type: "Release", properties: { - "android.injected.signing.store.file" => "../keystore.jks", + "android.injected.signing.store.file" => File.join(android_dir, "keystore.jks"), "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], "android.injected.signing.key.alias" => ENV["KEY_ALIAS"], "android.injected.signing.key.password" => ENV["KEY_PASSWORD"] From 2b1148673be7b5d2afe0f5d54ba8c1fd9b755db5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 08:18:03 +0000 Subject: [PATCH 27/58] chore(release): bump version to 1.5.6 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 9075be4..eac1e0a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.5 +1.5.6 diff --git a/android/app/build.gradle b/android/app/build.gradle index 803c8c3..4ecc27d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 16 - versionName "1.5.5" + versionCode 17 + versionName "1.5.6" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 1bd9fb9..ebf63a6 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.5; + MARKETING_VERSION = 1.5.6; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 74cea76..93a9ac9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.5", + "version": "1.5.6", "private": true, "scripts": { "prepare": "husky", From c490261faaa2130b0067389c7dca35ccb04e91ac Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 09:41:01 +0100 Subject: [PATCH 28/58] fix(ci): update android_dir --- android/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index bad27ff..098652b 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -3,7 +3,7 @@ default_platform :android platform :android do desc "Release Android app to Alpha track" lane :release_android_alpha do - android_dir = Dir.pwd # working-directory in workflow should be set to android for this to work + android_dir = File.expand_path('..', Dir.pwd) gradle( task: "bundle", build_type: "Release", From eca657f2ef5e82472412b8cdb11e3e798d72556c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 08:42:02 +0000 Subject: [PATCH 29/58] chore(release): bump version to 1.5.7 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index eac1e0a..f01291b 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.6 +1.5.7 diff --git a/android/app/build.gradle b/android/app/build.gradle index 4ecc27d..390946f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 17 - versionName "1.5.6" + versionCode 18 + versionName "1.5.7" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index ebf63a6..4746718 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.6; + MARKETING_VERSION = 1.5.7; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 93a9ac9..7fbe910 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.6", + "version": "1.5.7", "private": true, "scripts": { "prepare": "husky", From f4f8253b938543066b99edb1e9770d49a0bbb03a Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 10:10:01 +0100 Subject: [PATCH 30/58] fix(ci): update fastfile with credentials file --- .github/workflows/release.yml | 3 +++ android/fastlane/Fastfile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0031265..d860738 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,10 +90,12 @@ jobs: # Step 9: Authenticate to Google Cloud - name: Authenticate to Google Cloud + id: auth uses: google-github-actions/auth@v2 with: service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} + create_credentials_file: true # Step 10: Build and upload Android app to Alpha track - name: Build and upload Android app @@ -103,6 +105,7 @@ jobs: KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} GRADLE_USER_HOME: ${{ runner.temp }}/.gradle + GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} run: bundle exec fastlane release_android_alpha # Job 2: iOS Build and Upload (runs on macOS) diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 098652b..a66f3ec 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -19,7 +19,8 @@ platform :android do track: "alpha", skip_upload_metadata: true, skip_upload_images: true, - skip_upload_screenshots: true + skip_upload_screenshots: true, + json_key: ENV["GOOGLE_APPLICATION_CREDENTIALS"] ) end end From 95118a46482f2a4c99dbe85b83507f1127f7dc02 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 09:11:01 +0000 Subject: [PATCH 31/58] chore(release): bump version to 1.5.8 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index f01291b..1cc9c18 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.7 +1.5.8 diff --git a/android/app/build.gradle b/android/app/build.gradle index 390946f..f1da930 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 18 - versionName "1.5.7" + versionCode 19 + versionName "1.5.8" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 4746718..34647a9 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.5.8; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.5.8; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.5.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.7; + MARKETING_VERSION = 1.5.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 7fbe910..831f49b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.7", + "version": "1.5.8", "private": true, "scripts": { "prepare": "husky", From d4c6ba5b3ac2b45815167fcba551b86ec09e8e8e Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 11:29:56 +0100 Subject: [PATCH 32/58] fix(ci): add json key --- .github/workflows/release.yml | 7 +++++-- android/fastlane/Fastfile | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d860738..f433f76 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,8 +105,11 @@ jobs: KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} GRADLE_USER_HOME: ${{ runner.temp }}/.gradle - GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} - run: bundle exec fastlane release_android_alpha + #GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} # This is not supported by fastlane, we need to replace it with PLAY_STORE_JSON_KEY in the future. + PLAY_STORE_JSON_KEY: ${{ secrets.PLAY_STORE_SERVICE_ACCOUNT_JSON }} + run: | + echo "$PLAY_STORE_JSON_KEY" > play-store-key.json + bundle exec fastlane release_android_alpha # Job 2: iOS Build and Upload (runs on macOS) build_ios: diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index a66f3ec..e6b9599 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :android do skip_upload_metadata: true, skip_upload_images: true, skip_upload_screenshots: true, - json_key: ENV["GOOGLE_APPLICATION_CREDENTIALS"] + json_key: File.join(android_dir, "play-store-key.json") ) end end From 714c755bc681549f260e653e0fe91afbbd504f6a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 10:30:49 +0000 Subject: [PATCH 33/58] chore(release): bump version to 1.5.9 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 1cc9c18..2b26b8d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.8 +1.5.9 diff --git a/android/app/build.gradle b/android/app/build.gradle index f1da930..a0ee587 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 19 - versionName "1.5.8" + versionCode 20 + versionName "1.5.9" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 34647a9..d5f50c7 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.8; + MARKETING_VERSION = 1.5.9; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.8; + MARKETING_VERSION = 1.5.9; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.8; + MARKETING_VERSION = 1.5.9; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.8; + MARKETING_VERSION = 1.5.9; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 831f49b..24f765e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.8", + "version": "1.5.9", "private": true, "scripts": { "prepare": "husky", From de81c0c4a70cd76b296053d3e44c4e9c27e4ea3e Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 12:38:44 +0100 Subject: [PATCH 34/58] fix(ci): add package name to fastfile for android --- android/fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index e6b9599..f243600 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -17,6 +17,7 @@ platform :android do upload_to_play_store( track: "alpha", + package_name: "ai.pocketpal.app", skip_upload_metadata: true, skip_upload_images: true, skip_upload_screenshots: true, From 16bdbb786177b18b117fa3ac43bbb28f86d6c304 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 11:40:29 +0000 Subject: [PATCH 35/58] chore(release): bump version to 1.5.10 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 2b26b8d..f0ed379 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.9 +1.5.10 diff --git a/android/app/build.gradle b/android/app/build.gradle index a0ee587..4b7ef63 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 20 - versionName "1.5.9" + versionCode 21 + versionName "1.5.10" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index d5f50c7..e56f6ca 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 20; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 24f765e..422d0da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.9", + "version": "1.5.10", "private": true, "scripts": { "prepare": "husky", From 5a59f8aad229c1d93209b068b08bfd5704daa6ab Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 13:16:26 +0100 Subject: [PATCH 36/58] chore(ci): nothing just trigger ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f433f76..f7c229b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,7 +105,7 @@ jobs: KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} GRADLE_USER_HOME: ${{ runner.temp }}/.gradle - #GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} # This is not supported by fastlane, we need to replace it with PLAY_STORE_JSON_KEY in the future. + # GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} # This is not supported by fastlane, we need to replace it with PLAY_STORE_JSON_KEY in the future. PLAY_STORE_JSON_KEY: ${{ secrets.PLAY_STORE_SERVICE_ACCOUNT_JSON }} run: | echo "$PLAY_STORE_JSON_KEY" > play-store-key.json From 9836922972239d5aa5003da451fdab05ae1c7a6d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 12:30:21 +0000 Subject: [PATCH 37/58] chore(release): bump version to 1.5.11 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index f0ed379..df80819 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.10 +1.5.11 diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b7ef63..5c5b19c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 21 - versionName "1.5.10" + versionCode 22 + versionName "1.5.11" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index e56f6ca..db99e79 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.10; + MARKETING_VERSION = 1.5.11; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.10; + MARKETING_VERSION = 1.5.11; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.10; + MARKETING_VERSION = 1.5.11; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.10; + MARKETING_VERSION = 1.5.11; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 422d0da..8cd9149 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.10", + "version": "1.5.11", "private": true, "scripts": { "prepare": "husky", From 49ae8b512bff3f80daa751443739e6cd4d2b6243 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 13:47:59 +0100 Subject: [PATCH 38/58] chore(ci): nothing just triggering ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7c229b..972447e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,7 +105,7 @@ jobs: KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} GRADLE_USER_HOME: ${{ runner.temp }}/.gradle - # GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} # This is not supported by fastlane, we need to replace it with PLAY_STORE_JSON_KEY in the future. + # GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }} # This is not supported by fastlane, we need to replace it with PLAY_STORE_JSON_KEY in the future. PLAY_STORE_JSON_KEY: ${{ secrets.PLAY_STORE_SERVICE_ACCOUNT_JSON }} run: | echo "$PLAY_STORE_JSON_KEY" > play-store-key.json From cb9711aa9cffc37b0dcfa68205c5e2255c2d6d9e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 12:48:58 +0000 Subject: [PATCH 39/58] chore(release): bump version to 1.5.12 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index df80819..41336a1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.11 +1.5.12 diff --git a/android/app/build.gradle b/android/app/build.gradle index 5c5b19c..8fff071 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 22 - versionName "1.5.11" + versionCode 23 + versionName "1.5.12" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index db99e79..5e6c8b8 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.11; + MARKETING_VERSION = 1.5.12; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.11; + MARKETING_VERSION = 1.5.12; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.11; + MARKETING_VERSION = 1.5.12; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.11; + MARKETING_VERSION = 1.5.12; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 8cd9149..c2d50bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.11", + "version": "1.5.12", "private": true, "scripts": { "prepare": "husky", From 3b0cf454592fa5de473adc2cdc0050be6b7c17bf Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 14:06:42 +0100 Subject: [PATCH 40/58] fix(ci): use com.pocketpalai for the package name for upload to play store --- android/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index f243600..e8152a6 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -17,7 +17,7 @@ platform :android do upload_to_play_store( track: "alpha", - package_name: "ai.pocketpal.app", + package_name: "com.pocketpalai", skip_upload_metadata: true, skip_upload_images: true, skip_upload_screenshots: true, From 84f6f70734c6cd748283c4202185553d33578f9d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 13:08:14 +0000 Subject: [PATCH 41/58] chore(release): bump version to 1.5.13 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 41336a1..fa85d4d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.12 +1.5.13 diff --git a/android/app/build.gradle b/android/app/build.gradle index 8fff071..e945f62 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 23 - versionName "1.5.12" + versionCode 24 + versionName "1.5.13" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 5e6c8b8..5b9523a 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.12; + MARKETING_VERSION = 1.5.13; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.12; + MARKETING_VERSION = 1.5.13; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.12; + MARKETING_VERSION = 1.5.13; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.12; + MARKETING_VERSION = 1.5.13; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index c2d50bc..3aba986 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.12", + "version": "1.5.13", "private": true, "scripts": { "prepare": "husky", From 2dcc8173babc0b11458ad2a252bdb33417ff6bc8 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 14:49:22 +0100 Subject: [PATCH 42/58] fix(ci): ios fastfile update --- ios/fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 03d6ffe..1cc04dc 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -19,7 +19,7 @@ platform :ios do ) build_ios_app( - scheme: "PocketPal", # Replace with your app's scheme + scheme: "PocketPal", export_method: "app-store", output_directory: "./build", clean: true @@ -27,7 +27,7 @@ platform :ios do upload_to_testflight( api_key: api_key, - skip_waiting_for_build_processing: false + skip_waiting_for_build_processing: false, wait_processing_interval: 60, # Check every minute wait_for_uploaded_build: true, wait_processing_timeout_duration: 1800 # 30 minutes timeout From bcb9c0c3a507a0b43414f6a55a9a90f7f59f9e59 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 13:50:14 +0000 Subject: [PATCH 43/58] chore(release): bump version to 1.5.14 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index fa85d4d..8df6b88 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.13 +1.5.14 diff --git a/android/app/build.gradle b/android/app/build.gradle index e945f62..6a69abb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 24 - versionName "1.5.13" + versionCode 25 + versionName "1.5.14" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 5b9523a..4c8e97c 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.13; + MARKETING_VERSION = 1.5.14; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.13; + MARKETING_VERSION = 1.5.14; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.13; + MARKETING_VERSION = 1.5.14; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.13; + MARKETING_VERSION = 1.5.14; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 3aba986..c93938e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.13", + "version": "1.5.14", "private": true, "scripts": { "prepare": "husky", From f7aa62df02b587869d7217aa1dbaa05578fdb859 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 17:03:44 +0100 Subject: [PATCH 44/58] chore(ci): add matfile for ios --- .github/workflows/release.yml | 3 +++ ios/fastlane/Fastfile | 5 +++-- ios/fastlane/Matchfile | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ios/fastlane/Matchfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 972447e..98bf805 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,10 @@ jobs: working-directory: ios env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }} + MATCH_GITHUB_TOKEN: ${{ secrets.MATCH_GITHUB_TOKEN }} APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }} APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }} APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }} + APP_STORE_CONNECT_USER_ID: ${{ secrets.APP_STORE_CONNECT_USER_ID }} run: bundle exec fastlane release_ios diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 1cc04dc..2389598 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -12,10 +12,11 @@ platform :ios do match( type: "appstore", - readonly: false, + readonly: true, api_key: api_key, git_branch: "master", - password: ENV['MATCH_PASSWORD'] + password: ENV['MATCH_PASSWORD'], + git_basic_authorization: ENV['MATCH_GITHUB_TOKEN'] ) build_ios_app( diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile new file mode 100644 index 0000000..d59eb90 --- /dev/null +++ b/ios/fastlane/Matchfile @@ -0,0 +1,17 @@ +git_url(ENV['MATCH_GIT_URL']) +git_basic_authorization(ENV['MATCH_GITHUB_TOKEN']) + +storage_mode("git") + +type("appstore") # The default type, can be: appstore, adhoc, enterprise or development + +app_identifier(["ai.pocketpal"]) +username(ENV['APP_STORE_CONNECT_USER_ID']) + +# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"]) +# username("user@fastlane.tools") # Your Apple Developer Portal username + +# For all available options run `fastlane match --help` +# Remove the # in the beginning of the line to enable the other options + +# The docs are available on https://docs.fastlane.tools/actions/match From 23b8022c90c579150cf9ab3e6e6b7145831ed0c6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 16:04:56 +0000 Subject: [PATCH 45/58] chore(release): bump version to 1.5.15 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 8df6b88..f6ed435 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.14 +1.5.15 diff --git a/android/app/build.gradle b/android/app/build.gradle index 6a69abb..98cad24 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 25 - versionName "1.5.14" + versionCode 26 + versionName "1.5.15" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 4c8e97c..06e2d6b 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 26; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.14; + MARKETING_VERSION = 1.5.15; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 26; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.14; + MARKETING_VERSION = 1.5.15; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 26; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.14; + MARKETING_VERSION = 1.5.15; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 26; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.14; + MARKETING_VERSION = 1.5.15; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index c93938e..690420a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.14", + "version": "1.5.15", "private": true, "scripts": { "prepare": "husky", From 58f98f2f47edf4825578bb31741aebea24cde770 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 19:05:06 +0100 Subject: [PATCH 46/58] chore(ci): remove match password from match --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 2389598..e00d6ed 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -15,7 +15,7 @@ platform :ios do readonly: true, api_key: api_key, git_branch: "master", - password: ENV['MATCH_PASSWORD'], + #password: ENV['MATCH_PASSWORD'], # will be picked up from environment variables git_basic_authorization: ENV['MATCH_GITHUB_TOKEN'] ) From 7bf8c1481bac90b009dcea90ef3c998ec2187663 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 18:05:49 +0000 Subject: [PATCH 47/58] chore(release): bump version to 1.5.16 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index f6ed435..0ed0610 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.15 +1.5.16 diff --git a/android/app/build.gradle b/android/app/build.gradle index 98cad24..eba4198 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 26 - versionName "1.5.15" + versionCode 27 + versionName "1.5.16" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 06e2d6b..aa4c0d9 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.15; + MARKETING_VERSION = 1.5.16; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.15; + MARKETING_VERSION = 1.5.16; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.15; + MARKETING_VERSION = 1.5.16; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.15; + MARKETING_VERSION = 1.5.16; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 690420a..3ef04e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.15", + "version": "1.5.16", "private": true, "scripts": { "prepare": "husky", From 6d02cf3add7c0ef8c348222a685d64640f07cfac Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 20:07:41 +0100 Subject: [PATCH 48/58] chore(ci): encode github toke --- ios/fastlane/Fastfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index e00d6ed..bff834b 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -10,13 +10,19 @@ platform :ios do in_house: false ) + # Helper method to encode GitHub token + def encoded_github_token + require 'base64' + Base64.strict_encode64("x-access-token:#{ENV['MATCH_GITHUB_TOKEN']}") + end + match( type: "appstore", readonly: true, api_key: api_key, git_branch: "master", #password: ENV['MATCH_PASSWORD'], # will be picked up from environment variables - git_basic_authorization: ENV['MATCH_GITHUB_TOKEN'] + git_basic_authorization: encoded_github_token ) build_ios_app( From 5db979598048e2f33dd53d9cc16357c86a98b813 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 19:08:27 +0000 Subject: [PATCH 49/58] chore(release): bump version to 1.5.17 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 0ed0610..26c185e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.16 +1.5.17 diff --git a/android/app/build.gradle b/android/app/build.gradle index eba4198..638d569 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 27 - versionName "1.5.16" + versionCode 28 + versionName "1.5.17" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index aa4c0d9..834fd91 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.16; + MARKETING_VERSION = 1.5.17; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.16; + MARKETING_VERSION = 1.5.17; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.16; + MARKETING_VERSION = 1.5.17; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.16; + MARKETING_VERSION = 1.5.17; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 3ef04e6..ecc8e7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.16", + "version": "1.5.17", "private": true, "scripts": { "prepare": "husky", From 958c2db3f21490aca7b7f231c1428425dcb6c74a Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 21:29:28 +0100 Subject: [PATCH 50/58] fix(ci): keep fixing ios --- ios/PocketPal.xcodeproj/project.pbxproj | 11 +++-------- ios/fastlane/Fastfile | 10 +++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 834fd91..c6f4eec 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -628,10 +628,7 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -667,6 +664,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; @@ -699,10 +697,7 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index bff834b..1b89863 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -16,13 +16,21 @@ platform :ios do Base64.strict_encode64("x-access-token:#{ENV['MATCH_GITHUB_TOKEN']}") end + match( + type: "development", + readonly: true, + api_key: api_key, + git_branch: "master", + git_basic_authorization: encoded_github_token + ) + match( type: "appstore", readonly: true, api_key: api_key, git_branch: "master", #password: ENV['MATCH_PASSWORD'], # will be picked up from environment variables - git_basic_authorization: encoded_github_token + git_basic_authorization: encoded_github_token ) build_ios_app( From 8db7d3a8c7e1d586c92dd642e379c488d21938e8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 20:30:09 +0000 Subject: [PATCH 51/58] chore(release): bump version to 1.5.18 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 26 +++++++++++++++---------- package.json | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.version b/.version index 26c185e..83d4cf8 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.17 +1.5.18 diff --git a/android/app/build.gradle b/android/app/build.gradle index 638d569..50d18eb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 28 - versionName "1.5.17" + versionCode 29 + versionName "1.5.18" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index c6f4eec..7745651 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,7 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -525,7 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -533,7 +533,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -628,7 +628,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -697,7 +700,10 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/package.json b/package.json index ecc8e7d..086bf9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.17", + "version": "1.5.18", "private": true, "scripts": { "prepare": "husky", From e05647fc5964769c52ce0826396c4cf624712456 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 22:18:37 +0100 Subject: [PATCH 52/58] chore: keep fixing ios --- ios/PocketPal.xcodeproj/project.pbxproj | 34 +++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index c6f4eec..3bbc6b3 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 28; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -483,8 +483,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 28; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; ENABLE_BITCODE = NO; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -492,7 +495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -508,6 +511,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = ai.pocketpal; PRODUCT_NAME = PocketPal; + PROVISIONING_PROFILE_SPECIFIER = "match Development ai.pocketpal"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development ai.pocketpal"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -525,15 +530,18 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 28; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.17; + MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -549,6 +557,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = ai.pocketpal; PRODUCT_NAME = PocketPal; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore ai.pocketpal"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore ai.pocketpal"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -588,8 +598,10 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; @@ -665,8 +677,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; + DEVELOPMENT_TEAM = MYXGXY23Y6; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; From d7e0db4f8238e1e27ab29b3f6505f50affa98bef Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 22:24:01 +0100 Subject: [PATCH 53/58] chore: merge ver bump --- ios/PocketPal.xcodeproj/project.pbxproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 22debee..5e992bd 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -426,7 +426,6 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 29; - CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -440,7 +439,6 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.5.18; - MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -459,7 +457,6 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 29; - CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -469,7 +466,6 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.5.18; - MARKETING_VERSION = 1.5.18; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -500,7 +496,6 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.5.18; - MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -547,7 +542,6 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.5.18; - MARKETING_VERSION = 1.5.18; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", From de12ea872c48daeb9e25066e9824fc0f870fb289 Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Thu, 28 Nov 2024 22:28:16 +0100 Subject: [PATCH 54/58] chore(ci): add export_options to build_ios --- ios/fastlane/Fastfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 1b89863..f84ea79 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -37,7 +37,13 @@ platform :ios do scheme: "PocketPal", export_method: "app-store", output_directory: "./build", - clean: true + clean: true, + export_options: { + provisioningProfiles: { + "ai.pocketpal" => "match AppStore ai.pocketpal" + }, + signingStyle: "manual" + } ) upload_to_testflight( From ae6c0eb445d36eb2b4f2626971b6fc5e0e5b5ede Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Nov 2024 21:30:39 +0000 Subject: [PATCH 55/58] chore(release): bump version to 1.5.19 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index 83d4cf8..e7a15ce 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.18 +1.5.19 diff --git a/android/app/build.gradle b/android/app/build.gradle index 50d18eb..dafe1bc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 29 - versionName "1.5.18" + versionCode 30 + versionName "1.5.19" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index 5e992bd..d67b15b 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.18; + MARKETING_VERSION = 1.5.19; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.18; + MARKETING_VERSION = 1.5.19; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -485,7 +485,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEVELOPMENT_TEAM = MYXGXY23Y6; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; ENABLE_BITCODE = NO; @@ -495,7 +495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.18; + MARKETING_VERSION = 1.5.19; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -532,7 +532,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEVELOPMENT_TEAM = MYXGXY23Y6; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; @@ -541,7 +541,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.18; + MARKETING_VERSION = 1.5.19; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 086bf9b..211620b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.18", + "version": "1.5.19", "private": true, "scripts": { "prepare": "husky", From 350920977fde5106a81a9629b81889aa56df2e3b Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Fri, 29 Nov 2024 07:05:28 +0100 Subject: [PATCH 56/58] chore(ci): add setup_ci to fix freeze at [CP] Embed Pods Frameworks --- ios/fastlane/Fastfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index f84ea79..431c6ca 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -3,6 +3,8 @@ default_platform :ios platform :ios do desc "Release iOS app to TestFlight" lane :release_ios do + setup_ci(force: true) + api_key = app_store_connect_api_key( key_id: ENV['APP_STORE_CONNECT_API_KEY_ID'], issuer_id: ENV['APP_STORE_CONNECT_API_ISSUER_ID'], From bea4ecb1dda1fc16f4c91ab7ee13f484de3c5abf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Nov 2024 06:06:15 +0000 Subject: [PATCH 57/58] chore(release): bump version to 1.5.20 --- .version | 2 +- android/app/build.gradle | 4 ++-- ios/PocketPal.xcodeproj/project.pbxproj | 16 ++++++++-------- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.version b/.version index e7a15ce..a7ccabd 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.19 +1.5.20 diff --git a/android/app/build.gradle b/android/app/build.gradle index dafe1bc..7f59597 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,8 +81,8 @@ android { applicationId "com.pocketpalai" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 30 - versionName "1.5.19" + versionCode 31 + versionName "1.5.20" ndk { abiFilters "arm64-v8a", "x86_64" } diff --git a/ios/PocketPal.xcodeproj/project.pbxproj b/ios/PocketPal.xcodeproj/project.pbxproj index d67b15b..3eeee27 100644 --- a/ios/PocketPal.xcodeproj/project.pbxproj +++ b/ios/PocketPal.xcodeproj/project.pbxproj @@ -425,7 +425,7 @@ baseConfigurationReference = 12009917F81D5194B51E7253 /* Pods-PocketPal-PocketPalTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 30; + CURRENT_PROJECT_VERSION = 31; DEVELOPMENT_TEAM = MYXGXY23Y6; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -438,7 +438,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.19; + MARKETING_VERSION = 1.5.20; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -456,7 +456,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 30; + CURRENT_PROJECT_VERSION = 31; DEVELOPMENT_TEAM = MYXGXY23Y6; INFOPLIST_FILE = PocketPalTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -465,7 +465,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.5.19; + MARKETING_VERSION = 1.5.20; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -485,7 +485,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 30; + CURRENT_PROJECT_VERSION = 31; DEVELOPMENT_TEAM = MYXGXY23Y6; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; ENABLE_BITCODE = NO; @@ -495,7 +495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.19; + MARKETING_VERSION = 1.5.20; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", @@ -532,7 +532,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 30; + CURRENT_PROJECT_VERSION = 31; DEVELOPMENT_TEAM = MYXGXY23Y6; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = MYXGXY23Y6; INFOPLIST_FILE = PocketPal/Info.plist; @@ -541,7 +541,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.19; + MARKETING_VERSION = 1.5.20; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", diff --git a/package.json b/package.json index 211620b..d31defc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketPal", - "version": "1.5.19", + "version": "1.5.20", "private": true, "scripts": { "prepare": "husky", From 828ba3b34a8af41b1e62c9ac1bfab182c3576aee Mon Sep 17 00:00:00 2001 From: a-ghorbani Date: Fri, 29 Nov 2024 08:27:59 +0100 Subject: [PATCH 58/58] chore(ci): remove trigger on push --- .github/workflows/release.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98bf805..77903f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,15 +16,6 @@ on: - preminor - prepatch - prerelease - push: - branches: - - ci/test - paths-ignore: # Don't trigger on version-related files - - '.version' - - 'package.json' - - 'android/app/build.gradle' - - 'ios/**/Info.plist' - - 'ios/PocketPal.xcodeproj/project.pbxproj' jobs: # Job 1: Version Bumping and Android Build