diff --git a/deploy.sh b/deploy.sh index 2efd611..3b474e5 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,11 +2,9 @@ set -ex -if [[ "$*" != "-n" ]]; then - ./screenshots.sh "phoneScreenshots" - ./screenshots.sh "sevenInchScreenshots" - ./screenshots.sh "tenInchScreenshots" -fi +./screenshots.sh "phoneScreenshots" +./screenshots.sh "sevenInchScreenshots" +./screenshots.sh "tenInchScreenshots" line=$(yq -r .version pubspec.yaml) build_number=$(cut -d '+' -f 2 <<< "$line") @@ -23,7 +21,8 @@ yq -yi ".version |= \"$new_flutter_version\"" pubspec.yaml rest=$(git log -1 --pretty=%B | tail -n +2) git add pubspec.yaml last_commits=$(git log --pretty=format:"%s" @{u}..HEAD | awk '{print "- "$0}') -echo "$last_commits" > "fastlane/metadata/android/en-US/changelogs/$new_build_number.txt" +changelog_number=$((new_build_number * 10 + 3)) +echo "$last_commits" > "fastlane/metadata/android/en-US/changelogs/$changelog_number.txt" git add fastlane/metadata if [[ -n "$(git ls-files --others --exclude-standard)" ]]; then @@ -31,7 +30,7 @@ if [[ -n "$(git ls-files --others --exclude-standard)" ]]; then git --no-pager diff git restore --staged pubspec.yaml fastlane/metadata git restore pubspec.yaml fastlane/metadata - rm "fastlane/metadata/android/en-US/changelogs/$new_build_number.txt" + rm "fastlane/metadata/android/en-US/changelogs/$changelog_number.txt" exit 1 fi diff --git a/fastlane/metadata/android/en-US/changelogs/173.txt b/fastlane/metadata/android/en-US/changelogs/173.txt new file mode 100644 index 0000000..3f896b8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/173.txt @@ -0,0 +1,6 @@ +- Use correct changelog number for releases +- Merge branch 'main' of github.com:brandonp2412/FitBook +- Fix serving size calculations - 1.0.15 🚀 +- Fix per 100g comment for protein +- Change editing entries +- Move serving size above hidden fields diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png index 35b2031..f55f2ee 100644 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png differ diff --git a/pubspec.yaml b/pubspec.yaml index 1522f12..ca0b76a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: fit_book description: Track your calories - Completely offline! publish_to: none -version: 1.0.15+16 +version: 1.0.16+17 environment: sdk: '>=3.3.3 <4.0.0' dependencies: