Use correct changelog number for releases - 1.0.16 🚀

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,15 +21,16 @@ 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
     echo "There are unstaged changes in the repository:"
     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
 

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

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: