Skip to content

Commit f94db78

Browse files
mebarbosamebarbosa
committed
fix conflicts
2 parents 3ee22f6 + e687bd9 commit f94db78

File tree

189 files changed

+6047
-2987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+6047
-2987
lines changed

‎.buildkite/commands/diff-merged-manifest.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
6+
7+
BUILD_VARIANT=$1
8+
9+
echo "--- :rubygems: Setting up Gems"
10+
install_gems
11+
12+
echo "--- :closed_lock_with_key: Installing Secrets"
13+
bundle exec fastlane run configure_apply
14+
15+
echo "--- 💾 Diff Merged Manifest (Module: app, Build Variant: ${BUILD_VARIANT})"
16+
comment_with_manifest_diff "app" ${BUILD_VARIANT}
17+
18+
echo "--- 💾 Diff Merged Manifest (Module: wear, Build Variant: ${BUILD_VARIANT})"
19+
comment_with_manifest_diff "wear" ${BUILD_VARIANT}
20+
21+
echo "--- 💾 Diff Merged Manifest (Module: automotive, Build Variant: ${BUILD_VARIANT})"
22+
comment_with_manifest_diff "automotive" ${BUILD_VARIANT}

‎.buildkite/pipeline.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,21 @@ steps:
3535
command: ".buildkite/commands/run-unit-tests.sh"
3636
plugins: [$CI_TOOLKIT]
3737

38-
- label: 'Dependency diff'
39-
if: build.pull_request.id != null
40-
command: comment_with_dependency_diff 'app' 'releaseRuntimeClasspath'
41-
plugins: [$CI_TOOLKIT]
42-
artifact_paths:
43-
- "**/build/reports/diff/*"
38+
- group: "Diff Reports"
39+
steps:
40+
- label: 'Dependency diff'
41+
if: build.pull_request.id != null
42+
command: comment_with_dependency_diff 'app' 'releaseRuntimeClasspath'
43+
plugins: [$CI_TOOLKIT]
44+
artifact_paths:
45+
- "**/build/reports/diff/*"
46+
47+
- label: "Merged Manifest Diff"
48+
command: ".buildkite/commands/diff-merged-manifest.sh release"
49+
if: build.pull_request.id != null
50+
plugins: [$CI_TOOLKIT]
51+
artifact_paths:
52+
- "**/build/reports/diff_manifest/**/**/*"
4453

4554
- label: 'Spotless formatting check'
4655
command: |

‎.buildkite/release-pipelines/code-freeze.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ steps:
2222
queue: "tumblr-metal"
2323
retry:
2424
manual:
25-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2625
allowed: false
26+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/download-translations.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
# This pipeline is meant to be triggered by the MC scenario in ReleasesV2
5+
6+
steps:
7+
- label: "🚂 Download Translations"
8+
command: |
9+
echo '--- 🤖 Use bot for Git operations'
10+
source use-bot-for-git
11+
12+
echo '--- :ruby: Setup Ruby Tools'
13+
install_gems
14+
15+
echo '--- 🔐 Access Secrets'
16+
bundle exec fastlane run configure_apply
17+
18+
echo '--- 🚀 Download Translations'
19+
bundle exec fastlane download_translations
20+
plugins: [$CI_TOOLKIT]
21+
agents:
22+
queue: "tumblr-metal"
23+
retry:
24+
manual:
25+
allowed: false
26+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/finalize-hotfix-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ steps:
2424
queue: "tumblr-metal"
2525
retry:
2626
manual:
27-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2827
allowed: false
28+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/finalize-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ steps:
1818
bundle exec fastlane run configure_apply
1919
2020
echo '--- 🚀 Finalize Release'
21-
bundle exec fastlane finalize_release skip_confirm:true
21+
bundle exec fastlane finalize_release skip_confirm:true skip_translations_download:true
2222
plugins: [$CI_TOOLKIT]
2323
agents:
2424
queue: "tumblr-metal"
2525
retry:
2626
manual:
27-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2827
allowed: false
28+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/new-beta-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ steps:
2424
queue: "tumblr-metal"
2525
retry:
2626
manual:
27-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2827
allowed: false
28+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/new-hotfix-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ steps:
2222
queue: "tumblr-metal"
2323
retry:
2424
manual:
25-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2625
allowed: false
26+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/publish-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ steps:
2424
queue: "tumblr-metal"
2525
retry:
2626
manual:
27-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2827
allowed: false
28+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/release-pipelines/update-rollouts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ steps:
2424
queue: "tumblr-metal"
2525
retry:
2626
manual:
27-
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
2827
allowed: false
28+
reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

‎.buildkite/shared-pipeline-vars

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
44
# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
55

6-
export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.10.1"
6+
export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.1.3"

‎.github/dependabot.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ updates:
2020
labels:
2121
- "[Type] Tech Debt"
2222
- "[Area] Dependencies"
23+
groups:
24+
kotlin-ksp:
25+
applies-to: version-updates
26+
patterns:
27+
- "org.jetbrains.kotlin*"
28+
- "com.google.devtools.ksp*"
29+
exclude-patterns:
30+
- "org.jetbrains.kotlinx*"
2331
ignore:
2432
# Automattic libraries have a custom versioning scheme which doesn't work with Dependabot.
2533
- dependency-name: "com.automattic:Automattic-Tracks-Android"
@@ -45,5 +53,3 @@ updates:
4553
- dependency-name: "androidx.wear.compose:compose-foundation"
4654
- dependency-name: "androidx.wear.compose:compose-material"
4755
- dependency-name: "androidx.wear.compose:compose-navigation"
48-
# Ignore KSP as it needs to be updated together with Kotlin
49-
- dependency-name: "com.google.devtools.ksp"

‎.github/workflows/high-prio-issue-notify-slack.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Notify Slack when "[Priority] High" label is applied to an Issue or PR.
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
pull_request:
7+
types: [labeled]
8+
9+
jobs:
10+
notify_slack:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Check for "[Priority] High" Label
14+
id: check_label
15+
run: |
16+
if [[ "${{ github.event.label.name }}" == "[Priority] High" ]]; then
17+
echo "SEND_SLACK=true" >> $GITHUB_ENV
18+
echo "TYPE=${{ github.event_name == 'issues' && 'Issue' || 'Pull Request' }}" >> $GITHUB_ENV
19+
echo "LINK=<${{ github.event.issue.html_url || github.event.pull_request.html_url }}|${{ github.event.issue.title || github.event.pull_request.title }}>" >> $GITHUB_ENV
20+
echo "AUTHOR=${{ github.event.issue.user.login || github.event.pull_request.user.login }}" >> $GITHUB_ENV
21+
echo "NUMBER=${{ github.event.issue.number || github.event.pull_request.number }}" >> $GITHUB_ENV
22+
else
23+
echo "SEND_SLACK=false" >> $GITHUB_ENV
24+
fi
25+
26+
- name: Send Slack Notification
27+
if: env.SEND_SLACK == 'true'
28+
uses: slackapi/[email protected]
29+
with:
30+
webhook: ${{ secrets.SLACK_NOTIFIER_WEBHOOK_URL }}
31+
webhook-type: webhook-trigger
32+
payload: |
33+
{
34+
"text": ":pocket-casts::android: *High Priority Alert!*\n\n*Type:* ${{ env.TYPE }}\n*Link:* ${{ env.LINK }}\n*Created By:* ${{ env.AUTHOR }}\n*Number:* ${{ env.NUMBER }}"
35+
}

‎CHANGELOG.md

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
1-
7.85
1+
7.86
22
-----
33

44

5+
7.85
6+
-----
7+
* New Features
8+
* Add smart folders support.
9+
([#3720](https://github.com/Automattic/pocket-casts-android/pull/3720))
10+
* Add generated transcripts support.
11+
([#3772](https://github.com/Automattic/pocket-casts-android/pull/3772))
12+
* Bug Fixes
13+
* Fixed an issue where bookmark confirmation button was obstructed by keyboard.
14+
([#3761](https://github.com/Automattic/pocket-casts-android/pull/3761))
15+
* Fix issues with Classic widget not syncing its state in some scenarios.
16+
([#3777](https://github.com/Automattic/pocket-casts-android/pull/3777))
17+
* Fix podcast grid padding
18+
([#3781](https://github.com/Automattic/pocket-casts-android/pull/3781))
19+
* Fix multi-select toolbar being drawn behind the status bar on older Android versions.
20+
([#3792](https://github.com/Automattic/pocket-casts-android/pull/3792))
21+
* Updates
22+
* Close episode details screen when archiving an episode. This reverts [#3473](https://github.com/Automattic/pocket-casts-android/pull/3473).
23+
([#3718](https://github.com/Automattic/pocket-casts-android/pull/3718))
24+
* Update widget titles and add descriptions.
25+
([#3769](https://github.com/Automattic/pocket-casts-android/pull/3769))
26+
* Reorder podcasts sorting order based on their popularity.
27+
([#3733](https://github.com/Automattic/pocket-casts-android/pull/3733))
28+
* Improve small widget accessibility.
29+
([#3770](https://github.com/Automattic/pocket-casts-android/pull/3770))
30+
531
7.84.1
632
-----
733
* Bug Fixes

‎app/src/androidTest/java/au/com/shiftyjelly/pocketcasts/models/db/AppDatabaseTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ class AppDatabaseTest {
179179
AppDatabase.MIGRATION_107_108,
180180
AppDatabase.MIGRATION_108_109,
181181
AppDatabase.MIGRATION_109_110,
182+
AppDatabase.MIGRATION_110_111,
182183
)
183184
.build()
184185
// close the database and release any stream resources when the test finishes

0 commit comments

Comments
 (0)