From 2f524fc2b7bb8c957267c0f67e7cb75a99612475 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 21 Mar 2023 11:36:32 +0530 Subject: [PATCH] fix(build): remove `DSL_SCOPE_VIOLATION` suppression This was a Gradle bug that is now fixed https://docs.gradle.org/8.1-rc-1/release-notes.html#:~:text=Access%20to%20version%20catalog%20for%20plugins%20in%20the%20plugins%20%7B%7D%20block --- app/build.gradle.kts | 2 +- autofill-parser/build.gradle.kts | 2 -- build-logic/build.gradle.kts | 2 -- build.gradle.kts | 2 -- coroutine-utils-testing/build.gradle.kts | 2 -- coroutine-utils/build.gradle.kts | 2 -- crypto-common/build.gradle.kts | 2 -- crypto-pgpainless/build.gradle.kts | 2 -- format-common/build.gradle.kts | 2 -- openpgp-ktx/build.gradle.kts | 1 - passgen/diceware/build.gradle.kts | 2 -- passgen/random/build.gradle.kts | 2 -- sentry-stub/build.gradle.kts | 2 -- ui-compose/build.gradle.kts | 2 -- 14 files changed, 1 insertion(+), 26 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bbe15182b..9a86d2e33 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") +@file:Suppress("UnstableApiUsage") plugins { id("com.github.android-password-store.android-application") diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts index a77694a0c..844b7f3b4 100644 --- a/autofill-parser/build.gradle.kts +++ b/autofill-parser/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { id("com.github.android-password-store.published-android-library") id("com.github.android-password-store.kotlin-android") diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index b138fa943..6c1f970b6 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - import org.gradle.api.JavaVersion import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.withType diff --git a/build.gradle.kts b/build.gradle.kts index d82224e05..450f9faab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { id("com.github.android-password-store.git-hooks") id("com.github.android-password-store.kotlin-common") diff --git a/coroutine-utils-testing/build.gradle.kts b/coroutine-utils-testing/build.gradle.kts index 62ff4eeb1..96d87dc15 100644 --- a/coroutine-utils-testing/build.gradle.kts +++ b/coroutine-utils-testing/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/coroutine-utils/build.gradle.kts b/coroutine-utils/build.gradle.kts index 3daf5f4ff..78f1e8c26 100644 --- a/coroutine-utils/build.gradle.kts +++ b/coroutine-utils/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/crypto-common/build.gradle.kts b/crypto-common/build.gradle.kts index d05c1ad1f..b644cddd1 100644 --- a/crypto-common/build.gradle.kts +++ b/crypto-common/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/crypto-pgpainless/build.gradle.kts b/crypto-pgpainless/build.gradle.kts index 56c0c7621..ba7dac750 100644 --- a/crypto-pgpainless/build.gradle.kts +++ b/crypto-pgpainless/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts index 8382436c2..f20c56b69 100644 --- a/format-common/build.gradle.kts +++ b/format-common/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/openpgp-ktx/build.gradle.kts b/openpgp-ktx/build.gradle.kts index e68f8ecd1..e9b574ef0 100644 --- a/openpgp-ktx/build.gradle.kts +++ b/openpgp-ktx/build.gradle.kts @@ -2,7 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ - plugins { id("com.github.android-password-store.published-android-library") id("com.github.android-password-store.kotlin-android") diff --git a/passgen/diceware/build.gradle.kts b/passgen/diceware/build.gradle.kts index 5a7ce8c16..81db24cc6 100644 --- a/passgen/diceware/build.gradle.kts +++ b/passgen/diceware/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { id("com.github.android-password-store.android-library") id("com.github.android-password-store.kotlin-android") diff --git a/passgen/random/build.gradle.kts b/passgen/random/build.gradle.kts index ea598259c..0f48bcebb 100644 --- a/passgen/random/build.gradle.kts +++ b/passgen/random/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/sentry-stub/build.gradle.kts b/sentry-stub/build.gradle.kts index ea598259c..0f48bcebb 100644 --- a/sentry-stub/build.gradle.kts +++ b/sentry-stub/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { kotlin("jvm") id("com.github.android-password-store.kotlin-library") diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts index c8c96a4e9..e8abfeb87 100644 --- a/ui-compose/build.gradle.kts +++ b/ui-compose/build.gradle.kts @@ -2,8 +2,6 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - plugins { id("com.github.android-password-store.android-library") id("com.github.android-password-store.kotlin-android")