From bf5103e6af00df58fc0201ab0da79baf4e0a572e Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 10 Jan 2025 11:43:27 +0100 Subject: [PATCH] Recorder: Migrate generatebp to plugin declaration Change-Id: Iad849154ffe4b1903e79ac6e5c9eefa8a3fc9ffb --- app/build.gradle.kts | 18 ++---------------- build.gradle.kts | 3 ++- settings.gradle.kts | 5 ++++- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 308cb099..acf6d3e8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,29 +1,15 @@ /* - * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2025 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ -import org.lineageos.generatebp.GenerateBpPlugin import org.lineageos.generatebp.GenerateBpPluginExtension import org.lineageos.generatebp.models.Module plugins { id("com.android.application") id("kotlin-android") -} - -apply { - plugin() -} - -buildscript { - repositories { - maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.17/.m2") - } - - dependencies { - classpath("org.lineageos:gradle-generatebp:+") - } + id("org.lineageos.generatebp") } android { diff --git a/build.gradle.kts b/build.gradle.kts index 13750efe..1a093fa5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2025 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -7,6 +7,7 @@ plugins { id("com.android.application") version "8.7.2" apply false id("org.jetbrains.kotlin.android") version "1.7.10" apply false + id("org.lineageos.generatebp") version "+" apply false } tasks.register("clean").configure { diff --git a/settings.gradle.kts b/settings.gradle.kts index a63e4101..d3931514 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2025 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -8,8 +8,10 @@ pluginManagement { gradlePluginPortal() google() mavenCentral() + maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.21/.m2") } } + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -17,5 +19,6 @@ dependencyResolutionManagement { mavenCentral() } } + rootProject.name = "Recorder" include(":app")