diff options
Diffstat (limited to 'build-logic/src/main/kotlin/app/passwordstore')
4 files changed, 5 insertions, 86 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt index 9b43cbe1..6d38d1fc 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt @@ -7,8 +7,6 @@ package app.passwordstore.gradle -import app.passwordstore.gradle.flavors.FlavorDimensions -import app.passwordstore.gradle.flavors.ProductFlavors import app.passwordstore.gradle.signing.configureBuildSigning import com.android.build.api.dsl.ApplicationExtension import com.android.build.gradle.AppPlugin @@ -55,12 +53,6 @@ class ApplicationPlugin : Plugin<Project> { } } - flavorDimensions.add(FlavorDimensions.FREE) - productFlavors { - register(ProductFlavors.FREE) {} - register(ProductFlavors.NON_FREE) {} - } - project.configureBuildSigning() } } diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt deleted file mode 100644 index 1503bb9d..00000000 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -package app.passwordstore.gradle - -import app.passwordstore.gradle.flavors.FlavorDimensions -import app.passwordstore.gradle.flavors.ProductFlavors -import com.android.build.api.variant.ApplicationAndroidComponentsExtension -import io.sentry.android.gradle.SentryPlugin -import io.sentry.android.gradle.extensions.SentryPluginExtension -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.configure - -@Suppress("Unused") -class SentryPlugin : Plugin<Project> { - - override fun apply(project: Project) { - project.pluginManager.withPlugin("com.android.application") { - project.extensions.configure<ApplicationAndroidComponentsExtension> { - onVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) { - variant -> - val sentryDsn = project.providers.environmentVariable(SENTRY_DSN_PROPERTY).orElse("") - variant.manifestPlaceholders.put("sentryDsn", sentryDsn.get()) - } - } - project.plugins.apply(SentryPlugin::class) - project.extensions.configure<SentryPluginExtension> { - includeProguardMapping.set( - project.providers.gradleProperty(SENTRY_UPLOAD_MAPPINGS_PROPERTY).isPresent - ) - autoUploadProguardMapping.set( - project.providers.gradleProperty(SENTRY_UPLOAD_MAPPINGS_PROPERTY).isPresent - ) - ignoredBuildTypes.set(setOf("debug")) - ignoredFlavors.set(setOf(ProductFlavors.FREE)) - tracingInstrumentation { enabled.set(false) } - autoInstallation.enabled.set(false) - includeDependenciesReport.set(false) - } - } - } - - private companion object { - - private const val SENTRY_DSN_PROPERTY = "SENTRY_DSN" - private const val SENTRY_UPLOAD_MAPPINGS_PROPERTY = "sentryUploadMappings" - } -} diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt deleted file mode 100644 index 2206c4c8..00000000 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -package app.passwordstore.gradle.flavors - -object FlavorDimensions { - const val FREE = "free" -} - -object ProductFlavors { - const val FREE = "free" - const val NON_FREE = "nonFree" -} diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt index 0ed72afa..3ba2acf8 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt @@ -12,12 +12,11 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.findByType /** - * When the "slimTests" project property is provided, disable the unit test tasks on `release` build - * type and `nonFree` product flavor to avoid running the same tests repeatedly in different build - * variants. + * When the "slimTests" project property is provided, disable the unit test tasks on the `release` + * build type to avoid running the same tests twice. * - * Examples: `./gradlew test -PslimTests` will run unit tests for `nonFreeDebug` and `debug` build - * variants in Android App and Library projects, and all tests in JVM projects. + * Example: `./gradlew test -PslimTests` runs unit tests for the `debug` variant in Android App and + * Library projects, and all tests in JVM projects. */ @Suppress("UnstableApiUsage") internal fun Project.configureSlimTests() { @@ -30,16 +29,11 @@ internal fun Project.configureSlimTests() { } } - // Disable unit test tasks on the release build type and free flavor for Android Application - // projects. + // Disable unit test tasks on the release build type for Android Application projects. extensions.findByType<ApplicationAndroidComponentsExtension>()?.run { beforeVariants(selector().withBuildType(BUILD_TYPE_RELEASE)) { (it as HasUnitTestBuilder).enableUnitTest = false } - beforeVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) { - (it as HasUnitTestBuilder).enableUnitTest = false - it.androidTest.enable = false - } } } } |