diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 6255866..3f8a508 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -21,7 +21,6 @@ desc "Push a new release build to the Google Play" json_key: ENV['FASTLANE_JSON_KEY_PATH'], track: 'production', aab: '../app-release.aab', - changelog: {'default' => 'Streaming optimizations, show chats >10 in folders, SVG support'}, skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, diff --git a/android/fastlane/metadata/android/en-US/changelogs/29.txt b/android/fastlane/metadata/android/en-US/changelogs/29.txt deleted file mode 100644 index c74c5bc..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/29.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.4 \ No newline at end of file diff --git a/android/fastlane/metadata/android/en-US/changelogs/31.txt b/android/fastlane/metadata/android/en-US/changelogs/31.txt deleted file mode 100644 index 8f0300c..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/31.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.6 diff --git a/android/fastlane/metadata/android/en-US/changelogs/32.txt b/android/fastlane/metadata/android/en-US/changelogs/32.txt deleted file mode 100644 index 452178e..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/32.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.7 diff --git a/android/fastlane/metadata/android/en-US/changelogs/33.txt b/android/fastlane/metadata/android/en-US/changelogs/33.txt deleted file mode 100644 index d31d7cb..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/33.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.8 diff --git a/android/fastlane/metadata/android/en-US/changelogs/34.txt b/android/fastlane/metadata/android/en-US/changelogs/34.txt deleted file mode 100644 index e440403..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/34.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.9 diff --git a/android/fastlane/metadata/android/en-US/changelogs/35.txt b/android/fastlane/metadata/android/en-US/changelogs/35.txt deleted file mode 100644 index d51376b..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/35.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.10 diff --git a/android/fastlane/metadata/android/en-US/changelogs/36.txt b/android/fastlane/metadata/android/en-US/changelogs/36.txt deleted file mode 100644 index 03eb594..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/36.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.11 diff --git a/android/fastlane/metadata/android/en-US/changelogs/37.txt b/android/fastlane/metadata/android/en-US/changelogs/37.txt deleted file mode 100644 index 864e73a..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.12 diff --git a/android/fastlane/metadata/android/en-US/changelogs/38.txt b/android/fastlane/metadata/android/en-US/changelogs/38.txt deleted file mode 100644 index bd1ec81..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/38.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.13 diff --git a/android/fastlane/metadata/android/en-US/changelogs/39.txt b/android/fastlane/metadata/android/en-US/changelogs/39.txt deleted file mode 100644 index 007677a..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/39.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.1.14 diff --git a/android/fastlane/metadata/android/en-US/changelogs/40.txt b/android/fastlane/metadata/android/en-US/changelogs/40.txt deleted file mode 100644 index 7f98c98..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/40.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.0 diff --git a/android/fastlane/metadata/android/en-US/changelogs/41.txt b/android/fastlane/metadata/android/en-US/changelogs/41.txt deleted file mode 100644 index 792b77c..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/41.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.1 diff --git a/android/fastlane/metadata/android/en-US/changelogs/42.txt b/android/fastlane/metadata/android/en-US/changelogs/42.txt deleted file mode 100644 index e93ba92..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/42.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.2 diff --git a/android/fastlane/metadata/android/en-US/changelogs/43.txt b/android/fastlane/metadata/android/en-US/changelogs/43.txt deleted file mode 100644 index 0211ab0..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/43.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.3 diff --git a/android/fastlane/metadata/android/en-US/changelogs/44.txt b/android/fastlane/metadata/android/en-US/changelogs/44.txt deleted file mode 100644 index f44374f..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/44.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.4 diff --git a/android/fastlane/metadata/android/en-US/changelogs/45.txt b/android/fastlane/metadata/android/en-US/changelogs/45.txt deleted file mode 100644 index 3074e56..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/45.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.5 diff --git a/android/fastlane/metadata/android/en-US/changelogs/46.txt b/android/fastlane/metadata/android/en-US/changelogs/46.txt deleted file mode 100644 index 7f3cd38..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/46.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.6 diff --git a/android/fastlane/metadata/android/en-US/changelogs/70.txt b/android/fastlane/metadata/android/en-US/changelogs/70.txt deleted file mode 100644 index 235252b..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/70.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.7 diff --git a/android/fastlane/metadata/android/en-US/changelogs/71.txt b/android/fastlane/metadata/android/en-US/changelogs/71.txt deleted file mode 100644 index 978c1a8..0000000 --- a/android/fastlane/metadata/android/en-US/changelogs/71.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cogwheel0/conduit/releases/tag/v2.2.8 diff --git a/android/fastlane/metadata/android/en-US/changelogs/72.txt b/android/fastlane/metadata/android/en-US/changelogs/default.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/changelogs/72.txt rename to android/fastlane/metadata/android/en-US/changelogs/default.txt diff --git a/ios/fastlane/Deliverfile b/ios/fastlane/Deliverfile index 67ce39c..1507066 100644 --- a/ios/fastlane/Deliverfile +++ b/ios/fastlane/Deliverfile @@ -4,7 +4,7 @@ submit_for_review(true) skip_metadata(false) release_notes({ - 'default' => "https://github.com/cogwheel0/conduit/releases/tag/v2.2.9", + 'default' => "Streaming fixes", }) promotional_text({'default' => "https://github.com/cogwheel0/conduit/releases/tag/v2.2.9"}) skip_screenshots(true) diff --git a/scripts/release.sh b/scripts/release.sh index 79271ab..c8567c3 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -146,10 +146,10 @@ rm pubspec.yaml.bak print_status "Generating Fastlane changelogs..." LINK="https://github.com/cogwheel0/conduit/releases/tag/$TAG_VERSION" -# Android changelog (by build number) +# Android changelog (default only) ANDROID_CHANGELOG_DIR="android/fastlane/metadata/android/en-US/changelogs" mkdir -p "$ANDROID_CHANGELOG_DIR" -echo "$LINK" > "$ANDROID_CHANGELOG_DIR/$NEW_BUILD.txt" +echo "$LINK" > "$ANDROID_CHANGELOG_DIR/default.txt" # iOS release notes in Deliverfile IOS_DELIVERFILE="ios/fastlane/Deliverfile" @@ -159,7 +159,7 @@ rm "${IOS_DELIVERFILE}.bak" # Commit changes print_status "Committing changes..." -git add pubspec.yaml "$ANDROID_CHANGELOG_DIR/$NEW_BUILD.txt" "$IOS_DELIVERFILE" +git add pubspec.yaml "$ANDROID_CHANGELOG_DIR/default.txt" "$IOS_DELIVERFILE" git commit -m "chore: bump version to $NEW_VERSION" git push origin main