From 9514e130bb98a5554b77f3af1a27573d4d31bf4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Tue, 29 Oct 2024 11:02:57 +0100 Subject: [PATCH 01/18] docs(release): update checklist in the release pr template --- scripts/release-pr.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/release-pr.md b/scripts/release-pr.md index 6d84d90..11f242d 100644 --- a/scripts/release-pr.md +++ b/scripts/release-pr.md @@ -1,7 +1,7 @@ ## Prepare the release * [ ] If modified sync engine schema, double check the usage file only contains the final new definitions. * [ ] Prepare a pre-release in GitHub releases to generate a changelog. - * [ ] Use this link template, replacing `X.Y.Z` with release version (in 2 places): `https://github.com/Pocket/Android/releases/new?tag=X.Y.Z.0&target=release-X.Y.Z&prerelease=1`. (This will set some defaults, so you don't have to edit by hand.) + * [ ] Use this link template, replacing `X.Y.Z` with release version (in 2 places): `https://github.com/Pocket/pocket-android/releases/new?tag=X.Y.Z&target=release-X.Y.Z&prerelease=1`. (This will set some defaults, so you don't have to edit by hand.) * [ ] Use the "Generate release notes" button to use an auto-generated changelog. * [ ] Add a summary to the top of the changelog. * **Don't publish just yet!** @@ -15,10 +15,12 @@ ## Release on Google Play * [ ] Promote beta ([open testing](https://play.google.com/console/u/0/developers/5995605107085635372/app/4974611608118969152/tracks/open-testing)) to production. * [ ] Always update the release notes, because we don't want to keep the beta copy. If there is no prepared, agreed upon copy to call out new features, copy standard "bug fixes and improvements" notes from a previous **production** release. + * [ ] Set rollout percentage (usually to 100%, in case of bigger/riskier releases to 10%, discuss with the team if you think it should be something else). * [ ] Release a new beta by promoting the [internal test](https://play.google.com/console/u/0/developers/5995605107085635372/app/4974611608118969152/tracks/internal-testing) build to beta (open testing). * [ ] Copy previous **beta** release notes. * [ ] Check "Errors, warnings and messages". Google loves to put stuff in there that isn't really a problem, so there are "warnings" there we consistently ignore with each release. But, please, always check it to see if there isn't anything important this time. * [ ] Check changes between this and previous APK. (New App Bundles > Details (→ to the right of the new APK) > Changes tab) + * [ ] Set rollout percentage to 100%. * [ ] Go to [Publishing overview](https://play.google.com/console/u/0/developers/5995605107085635372/app/4974611608118969152/publishing) to send the changes for review. * [ ] Check the current Managed publishing setting. Keep if **off** to release as soon as it's through the review (e.g. when sending to review on the day of the release). Turn it **on** if preparing the release a day ahead and you want to manually release next morning. @@ -26,10 +28,10 @@ * Production * [ ] Post an update to #pocket-releases about the current rollout percentage. * [ ] Add the release to [Confluence](https://mozilla-hub.atlassian.net/wiki/spaces/PE/pages/665878545/Changelog+Releases+Pocket). - * [ ] Create a PR of `beta` into `prod` using this [template](https://github.com/Pocket/Android/compare/prod...beta?quick_pull=1&title=X.Y.Z.0+Production&body=Updating+`prod`+to+match+the+newly+promoted+build.&labels=ignore-for-release). Merge it (**do not squash!**). + * [ ] Create a PR of `beta` into `prod` using this [template](https://github.com/Pocket/pocket-android/compare/prod...beta?quick_pull=1&title=X.Y.Z.0+Production&body=Updating+`prod`+to+match+the+newly+promoted+build.&labels=ignore-for-release). Merge it (**do not squash!**). * Beta * [ ] Edit the GitHub release, uncheck "Set as a pre-release", check "Set as the latest release". - * [ ] Merge the PR into `beta` (**do not squash!**). + * [ ] Merge this PR into `beta` (**do not squash!**). * [ ] Create a PR of `beta` into `main`. (`beta` is protected, so we can't literally merge it, because it would delete it. Instead create a new branch from `beta`, merge `main` to resolve any conflicts and open a PR to merge this branch to `main`.) * [ ] Add `ignore-for-release` label. * [ ] Merge it (**do not squash!**). From 75b105ad30c1e31409563ebde0bfd4fb19c52f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Tue, 29 Oct 2024 12:42:11 +0100 Subject: [PATCH 02/18] build(renovate): fix plugin dependency lookup warning --- README.md | 15 ++++++++++++++- renovate.json | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 632b3db..1c8e010 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Use a set of Pocket-wide defaults. See [Pocket/renovate-config](https://github.c for more details and documentation. ```json { - "ignorePaths": ["buildSrc/**"] + "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"] } ``` Ignore our legacy dependency definitions in `buildSrc`, while we gradually migrate to version catalog. @@ -103,6 +103,19 @@ to let a human decide before merging. ``` Tweak the default commit message a bit to cut a redundant word from already pretty long messages. +```json +{ + "packageRules": [ + { + "matchDepNames": ["plugin-*"], + "semanticCommitType": "chore" + } + ] +} +``` +Update semantic commit rules to account for our custom plugin definitions +(because of defining them in `buildSrc`). + ### Sync Engine We have a lot of documentation about the Sync Engine, but you kind of have to know where to look for it. diff --git a/renovate.json b/renovate.json index e435c14..45e7540 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,7 @@ "extends": [ "local>Pocket/renovate-config" ], - "ignorePaths": ["buildSrc/**"], + "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"], "ignorePresets": [":dependencyDashboardApproval"], "packageRules": [ { @@ -13,6 +13,10 @@ { "matchManagers": ["gradle", "gradle-wrapper"], "commitMessageTopic": "{{depName}}" + }, + { + "matchDepNames": ["plugin-*"], + "semanticCommitType": "chore" } ] } From ef9220ec0dc8c0f21974a9e7cd4292db8a79946d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:06:37 +0000 Subject: [PATCH 03/18] fix(deps): update com.github.ben-manes:gradle-versions-plugin to v0.51.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6bc2b0d..94393dd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,7 +62,7 @@ plugin-kotlin-compose = { module = "org.jetbrains.kotlin:compose-compiler-gradle plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.12.0" } plugin-sentry = { module = "io.sentry:sentry-android-gradle-plugin", version = "4.13.0" } -plugin-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version = "0.39.0" } +plugin-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version = "0.51.0" } r8 = { module = "com.android.tools:r8", version = "8.7.14" } robolectric = { module = "org.robolectric:robolectric", version = "4.13" } sentry = { module = "io.sentry:sentry-android" } From 4cb7790f071225437dfca30f3d9e8143a81f306f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Tue, 29 Oct 2024 13:23:20 +0100 Subject: [PATCH 04/18] build(bitrise): update cache only from the main branch --- bitrise.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 9aa39b3..dd831f0 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -122,7 +122,6 @@ workflows: git add . git commit -m "chore(ci): prepare release [skip ci]" git push origin $BITRISE_GIT_BRANCH - - cache-push: {} publishAlphaToAppCenter: steps: - set-java-version@1: @@ -187,4 +186,3 @@ workflows: - deploy-to-bitrise-io@2: inputs: - notify_user_groups: none - - cache-push: {} From cb24755294f6cc2342b950f31834973ecd8dcbe9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:56:51 +0000 Subject: [PATCH 05/18] fix(deps): update androidx.fragment to v1.8.5 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94393dd..a7b8c83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] aboutlibraries = "11.2.3" androidx-activity = "1.9.3" -androidx-fragment = "1.8.4" +androidx-fragment = "1.8.5" androidx-navigation = "2.8.3" appcenter = "5.0.5" dagger = "2.52" From 806ccdad0343b1e3b723abc39cdd7ef56f4c1c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Thu, 31 Oct 2024 16:07:27 +0100 Subject: [PATCH 06/18] build(android): compile against android 15 apis --- buildSrc/src/main/kotlin/Configs.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Configs.kt b/buildSrc/src/main/kotlin/Configs.kt index bcf656d..43a26fc 100644 --- a/buildSrc/src/main/kotlin/Configs.kt +++ b/buildSrc/src/main/kotlin/Configs.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension object AndroidConfigs { - const val CompileSdkVersion = 34 + const val CompileSdkVersion = 35 const val MinSdkVersion = 23 const val TargetSdkVersion = 34 } From 8535f635a9a91f2af9fdf54369682dd8f37e6ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Thu, 31 Oct 2024 16:22:08 +0100 Subject: [PATCH 07/18] chore: clean up unused pocket url util --- .../com/pocket/sdk/util/PocketUrlUtilTest.kt | 15 ---- .../com/pocket/sdk/util/PocketUrlUtil.java | 86 ------------------- .../com/pocket/sdk/util/PocketUrlUtilTest.kt | 31 ------- 3 files changed, 132 deletions(-) delete mode 100644 Pocket/src/androidTest/java/com/pocket/sdk/util/PocketUrlUtilTest.kt delete mode 100644 Pocket/src/main/java/com/pocket/sdk/util/PocketUrlUtil.java delete mode 100644 Pocket/src/test/java/com/pocket/sdk/util/PocketUrlUtilTest.kt diff --git a/Pocket/src/androidTest/java/com/pocket/sdk/util/PocketUrlUtilTest.kt b/Pocket/src/androidTest/java/com/pocket/sdk/util/PocketUrlUtilTest.kt deleted file mode 100644 index e793041..0000000 --- a/Pocket/src/androidTest/java/com/pocket/sdk/util/PocketUrlUtilTest.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.pocket.sdk.util - -import org.junit.Test -import kotlin.test.assertEquals - -class PocketUrlUtilTest { - @Test fun asRedirect() { - val redirect = PocketUrlUtil.asRedirect("https://example.com", true) - - assertEquals( - "7db576d22b055fa4c502f0cfa80476031289f450edbe435394a80d2d5452ee03", - redirect.getQueryParameter("h") - ) - } -} diff --git a/Pocket/src/main/java/com/pocket/sdk/util/PocketUrlUtil.java b/Pocket/src/main/java/com/pocket/sdk/util/PocketUrlUtil.java deleted file mode 100644 index f223d26..0000000 --- a/Pocket/src/main/java/com/pocket/sdk/util/PocketUrlUtil.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.pocket.sdk.util; - -import android.net.Uri; - -import com.pocket.sdk.api.generated.thing.Post; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Map; - -import okio.ByteString; - -/** - * TODO Documentation - */ -public class PocketUrlUtil { - - private static final String SALT = "d4f31f7dbc57f2633b347e1c"; - - /** Makes getpocket.com/redirect urls */ - public static Uri asRedirect(String url, boolean asTrusted) { - Uri.Builder builder = new Uri.Builder() - .scheme("https") - .authority("getpocket.com") - .path("redirect") - .appendQueryParameter("url", url); - - if (asTrusted) { - String salt = SALT + "0f2eaa6ad4261f795913d2"; - String combo = Uri.encode(url) + "@" + (salt + "e7b4184f00cfd6cac2"); - String hash = ByteString.of(combo.getBytes()).sha256().hex(); - builder.appendQueryParameter("h", hash); - } - - return builder.build(); - } - - /** - * @param url - * @return boolean whether the url is a Pocket explore article. - */ - public static boolean isExploreUrl(String url) { - try { - URI uri = new URI(url); - String authority = uri.getAuthority(); - String path = uri.getPath(); - if (authority == null || path == null) { - return false; - } - return (authority.equals("getpocket.com") || - authority.endsWith(".getpocket.dev")) - && path.startsWith("/explore/item/"); - } catch (URISyntaxException e) { - return false; - } - } - - /** - * Append query parameters to the given url - * - * @param url - * @param parameters a {@link Map} of url parameters. - * @return new String url with the given parameters added. - */ - public static String appendParams(String url, Map parameters) { - try { - URI uri = new URI(url); - StringBuilder queryBuilder = new StringBuilder(); - - if (uri.getQuery() != null) - queryBuilder.append(uri.getQuery()); - - for (Map.Entry entry: parameters.entrySet()) { - String param = entry.getKey() + "=" + entry.getValue(); - if (!queryBuilder.toString().isEmpty()) { - queryBuilder.append("&"); - } - queryBuilder.append(param); - } - - return new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), queryBuilder.toString(), uri.getFragment()).toString(); - } catch (URISyntaxException e) { - return url; - } - } -} diff --git a/Pocket/src/test/java/com/pocket/sdk/util/PocketUrlUtilTest.kt b/Pocket/src/test/java/com/pocket/sdk/util/PocketUrlUtilTest.kt deleted file mode 100644 index 1eab92e..0000000 --- a/Pocket/src/test/java/com/pocket/sdk/util/PocketUrlUtilTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.pocket.sdk.util - -import org.junit.Test -import kotlin.test.assertFalse -import kotlin.test.assertTrue - -class `PocketUrlUtil should` { - @Test fun `recognize explore url in getpocket domain`() { - assertTrue { - PocketUrlUtil.isExploreUrl("https://getpocket.com/explore/item/how-britney-spears-changed-pop-with-baby-one-more-time") - } - } - - @Test fun `recognize explore url in dev domain`() { - assertTrue { - PocketUrlUtil.isExploreUrl("https://example.getpocket.dev/explore/item/how-britney-spears-changed-pop-with-baby-one-more-time") - } - } - - @Test fun `not recognize a topic url in getpocket domain as an explore url`() { - assertFalse { - PocketUrlUtil.isExploreUrl("https://getpocket.com/explore/science") - } - } - - @Test fun `not recognize a topic url in dev domain as an explore url`() { - assertFalse { - PocketUrlUtil.isExploreUrl("https://example.getpocket.dev/explore/science") - } - } -} From fe998956ef80f9f63281fb6fa2c4022b7cb3a963 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:44:03 +0000 Subject: [PATCH 08/18] fix(deps): update androidx.core:core-ktx to v1.15.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a7b8c83..86ab683 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -androidx-core = { module = "androidx.core:core-ktx", version = "1.13.1" } +androidx-core = { module = "androidx.core:core-ktx", version = "1.15.0" } androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" } androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "androidx-fragment" } androidx-media = { module = "androidx.media:media", version = "1.7.0" } From e14d8b5b8f7cb95c1bc3974d84113b3ba41dbff5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:44:06 +0000 Subject: [PATCH 09/18] fix(deps): update androidx.work:work-runtime to v2.10.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a7b8c83..13edc4d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = " androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "androidx-fragment" } androidx-media = { module = "androidx.media:media", version = "1.7.0" } androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" } -androidx-work = { module = "androidx.work:work-runtime", version = "2.9.1" } +androidx-work = { module = "androidx.work:work-runtime", version = "2.10.0" } appcenter-distribute = { module = "com.microsoft.appcenter:appcenter-distribute", version.ref = "appcenter" } appcenter-distribute-play = { module = "com.microsoft.appcenter:appcenter-distribute-play", version.ref = "appcenter" } braze = { module = "com.braze:android-sdk-ui", version = "33.0.0" } From bb6a8529a93a67743df5fb4b94fb08bef5260bf8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 18:56:54 +0000 Subject: [PATCH 10/18] fix(deps): update androidx.compose:compose-bom to v2024.10.01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ddd3529..10696d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ adjust = { module = "com.adjust.sdk:adjust-android", version = "4.38.5" } androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" } -androidx-compose-bom = { module = "androidx.compose:compose-bom", version = "2024.10.00" } +androidx-compose-bom = { module = "androidx.compose:compose-bom", version = "2024.10.01" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } From 10c931be946588aca4f46f38507cd140dab588c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 22:54:33 +0000 Subject: [PATCH 11/18] fix(deps): update com.android.tools.build:gradle to v8.7.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 10696d3..ba196ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,7 +54,7 @@ okhttp-urlconnection = { module = "com.squareup.okhttp3:okhttp-urlconnection", v okio = { module = "com.squareup.okio:okio", version.ref = "okio" } okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "okio" } plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" } -plugin-android = { module = "com.android.tools.build:gradle", version = "8.7.1" } +plugin-android = { module = "com.android.tools.build:gradle", version = "8.7.2" } plugin-androidx-navigation-safeargs = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "androidx-navigation" } plugin-dagger = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger" } plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } From e376403fd18ef1455df2ea95f22152194383878e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Tue, 5 Nov 2024 11:49:36 +0100 Subject: [PATCH 12/18] build(gha): cancel pr checks on stale commits --- .github/workflows/on-pull-request.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index f716dec..97f6e5a 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -4,6 +4,11 @@ on: pull_request: merge_group: +# Cancel in-progress/pending PR checks if a new commit is pushed to the branch. +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }} + cancel-in-progress: true + jobs: android-lint: name: Android Lint From 9f9e52d72b3154138b3f2b6a76264ae19ae9810f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:32:24 +0000 Subject: [PATCH 13/18] fix(deps): update com.braze:android-sdk-ui to v33.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba196ac..a6cf45b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragme androidx-work = { module = "androidx.work:work-runtime", version = "2.10.0" } appcenter-distribute = { module = "com.microsoft.appcenter:appcenter-distribute", version.ref = "appcenter" } appcenter-distribute-play = { module = "com.microsoft.appcenter:appcenter-distribute-play", version.ref = "appcenter" } -braze = { module = "com.braze:android-sdk-ui", version = "33.0.0" } +braze = { module = "com.braze:android-sdk-ui", version = "33.1.0" } google-play-billing = { module = "com.android.billingclient:billing-ktx", version = "7.1.1" } dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger" } dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" } From b46e5c9e81df30c1f752e779697d6ab4a1d632be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Thu, 7 Nov 2024 10:22:58 +0100 Subject: [PATCH 14/18] chore(deps): update com.android.tools:r8 to v8.7.20 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6cf45b..499f36a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -63,7 +63,7 @@ plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serializat plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.12.0" } plugin-sentry = { module = "io.sentry:sentry-android-gradle-plugin", version = "4.13.0" } plugin-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version = "0.51.0" } -r8 = { module = "com.android.tools:r8", version = "8.7.14" } +r8 = { module = "com.android.tools:r8", version = "8.7.20" } robolectric = { module = "org.robolectric:robolectric", version = "4.13" } sentry = { module = "io.sentry:sentry-android" } sentry-bom = { module = "io.sentry:sentry-bom", version = "7.16.0" } From cec373ff90798e34a1157d1c712253dba871cb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Fri, 8 Nov 2024 12:09:55 +0100 Subject: [PATCH 15/18] build(renovate): add renovate/reconfigure to base branches --- README.md | 8 ++++++++ renovate.json | 1 + 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 1c8e010..e6f84f7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,14 @@ Because JSON doesn't support comments, here's some documentation on our [renovat Use a set of Pocket-wide defaults. See [Pocket/renovate-config](https://github.com/Pocket/renovate-config) for more details and documentation. ```json +{ + "baseBranches": ["$default", "renovate/reconfigure"] +} +``` +Detect and process the special renovate configuration change validation branch +in addition to the repository's default branch. +This allows testing a full renovate run before merging the updated configuration. +```json { "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"] } diff --git a/renovate.json b/renovate.json index 45e7540..8b83042 100644 --- a/renovate.json +++ b/renovate.json @@ -3,6 +3,7 @@ "extends": [ "local>Pocket/renovate-config" ], + "baseBranches": ["$default", "renovate/reconfigure"], "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"], "ignorePresets": [":dependencyDashboardApproval"], "packageRules": [ From 81f87c5c7e130d9d97a88d5bc4fd81cfed01ca64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Fri, 8 Nov 2024 13:08:31 +0100 Subject: [PATCH 16/18] Revert "build(renovate): add renovate/reconfigure to base branches" --- README.md | 8 -------- renovate.json | 1 - 2 files changed, 9 deletions(-) diff --git a/README.md b/README.md index e6f84f7..1c8e010 100644 --- a/README.md +++ b/README.md @@ -65,14 +65,6 @@ Because JSON doesn't support comments, here's some documentation on our [renovat Use a set of Pocket-wide defaults. See [Pocket/renovate-config](https://github.com/Pocket/renovate-config) for more details and documentation. ```json -{ - "baseBranches": ["$default", "renovate/reconfigure"] -} -``` -Detect and process the special renovate configuration change validation branch -in addition to the repository's default branch. -This allows testing a full renovate run before merging the updated configuration. -```json { "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"] } diff --git a/renovate.json b/renovate.json index 8b83042..45e7540 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,6 @@ "extends": [ "local>Pocket/renovate-config" ], - "baseBranches": ["$default", "renovate/reconfigure"], "ignorePaths": ["buildSrc/src/main/kotlin/Deps.kt"], "ignorePresets": [":dependencyDashboardApproval"], "packageRules": [ From e8914d958a7820be0f3df1971de47bb438960f05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 17:46:14 +0000 Subject: [PATCH 17/18] chore(deps): update gradle to v8.11 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 79eb9d0..7cf748e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 1414c2393d5b559ec005801d5ebe54b21b2aec32 Mon Sep 17 00:00:00 2001 From: Bitrise Bot Date: Tue, 12 Nov 2024 09:53:29 +0000 Subject: [PATCH 18/18] chore(ci): prepare release [skip ci] --- Pocket/build.gradle.kts | 2 +- .../playUnsignedRelease/AndroidManifest.xml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Pocket/build.gradle.kts b/Pocket/build.gradle.kts index cd44f32..1719a42 100644 --- a/Pocket/build.gradle.kts +++ b/Pocket/build.gradle.kts @@ -15,7 +15,7 @@ plugins { } val versionMajor = 8 // Max value of 200 -val versionMinor = 27 // Max of two digits +val versionMinor = 28 // Max of two digits val versionPatch = 0 // Max of two digits val versionBuild = 0 // Max of three digits diff --git a/Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml b/Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml index 72e2e2d..481a7f9 100644 --- a/Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml +++ b/Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml @@ -3,8 +3,8 @@ package="com.ideashower.readitlater.pro" android:installLocation="auto" android:targetSandboxVersion="2" - android:versionCode="82700000" - android:versionName="8.27.0.0" > + android:versionCode="82800000" + android:versionName="8.28.0.0" > + + + @@ -680,11 +686,6 @@ android:name="androidx.window.sidecar" android:required="false" /> - -