From f78754e26c6274f997bbfe0798f47aa86f8f8133 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 2 Nov 2026 13:31:30 +0100 Subject: build: drop the nonFree flavor, Sentry and Play Services The fork targets GrapheneOS and ships only FOSS builds. The nonFree flavor added Sentry crash reporting, wired to upstream's Sentry project, and Play Services SMS one-time-code autofill, which needs Google's servers. Neither is wanted, so remove the flavor dimension entirely: - Delete app/src/nonFree, the SentryPlugin, the sentry-stub module, the Sentry and Play Services catalog entries, and the Sentry scope setup in Application. - Move the free AutofillSmsActivity stub into main; it keeps the SMS OTP feature off exactly as the free build did. A ponytail note marks the FillOtpFromSms paths for later removal. - SlimTests no longer needs to skip a nonFree variant. - Workflows and docs use :app:assembleDebug / :app:assembleRelease. A bare assembleRelease would also verify library modules in release mode, where ui:compose fails on a pre-existing AppCompat attribute reference the old flavored task never touched. Co-Authored-By: Claude Opus 5.5 --- sentry-stub/src/main/kotlin/io/sentry/Scope.kt | 16 ---------------- sentry-stub/src/main/kotlin/io/sentry/Sentry.kt | 13 ------------- sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt | 17 ----------------- 3 files changed, 46 deletions(-) delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/Scope.kt delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/Sentry.kt delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt (limited to 'sentry-stub/src') diff --git a/sentry-stub/src/main/kotlin/io/sentry/Scope.kt b/sentry-stub/src/main/kotlin/io/sentry/Scope.kt deleted file mode 100644 index 256496cd..00000000 --- a/sentry-stub/src/main/kotlin/io/sentry/Scope.kt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -@file:Suppress("Unused", "UNUSED_PARAMETER") - -package io.sentry - -import io.sentry.protocol.User - -public class Scope { - public var user: User? = null - - public fun setTag(tag: String, value: String) {} -} diff --git a/sentry-stub/src/main/kotlin/io/sentry/Sentry.kt b/sentry-stub/src/main/kotlin/io/sentry/Sentry.kt deleted file mode 100644 index 103766a8..00000000 --- a/sentry-stub/src/main/kotlin/io/sentry/Sentry.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -@file:Suppress("Unused", "UNUSED_PARAMETER") - -package io.sentry - -/** Stubs for the Sentry SDK */ -public object Sentry { - public fun configureScope(callback: (Scope) -> Unit) {} -} diff --git a/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt b/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt deleted file mode 100644 index 318ab8cf..00000000 --- a/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -@file:Suppress("Unused", "UNUSED_PARAMETER") - -package io.sentry.protocol - -public data class User( - public var email: String? = null, - public var id: String? = null, - public var username: String? = null, - public var ipAddress: String? = null, - public var data: Map? = null, - public var unknown: Map? = null, -) -- cgit v1.2.3