From 674a7d299bbe10692902d35fd2bbeef9ebe7a9f5 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 26 Dec 2021 11:59:57 +0530
Subject: Misc cleanups to build-logic and expand BCV exclusion list (#1622)

* build-logic: remove `kotlin-dsl-precompiled-script-plugins` plugin

* build-logic: use generated accessors for extensions

* build: exclude non-published library projects from API dump

There's no point in tracking binary compatibility for libraries that are only used internally
---
 ...ndroid-password-store.binary-compatibility.gradle.kts | 16 ++++++++++++----
 ....github.android-password-store.kotlin-kapt.gradle.kts |  4 +---
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'build-logic/kotlin-plugins/src')

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
index 053a69ab..4e0ceaa3 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
@@ -3,9 +3,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-import kotlinx.validation.ApiValidationExtension
-import org.gradle.kotlin.dsl.configure
-
 plugins { id("org.jetbrains.kotlinx.binary-compatibility-validator") }
 
-extensions.configure<ApiValidationExtension> { ignoredProjects = mutableSetOf("app") }
+apiValidation {
+  ignoredProjects =
+    mutableSetOf(
+      "app",
+      "coroutine-utils",
+      "coroutine-utils-testing",
+      "crypto-common",
+      "crypto-pgpainless",
+      "format-common",
+      "diceware",
+    )
+}
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-kapt.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-kapt.gradle.kts
index 36642ba4..14542655 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-kapt.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-kapt.gradle.kts
@@ -4,8 +4,6 @@
  */
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
-import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 
 plugins {
   kotlin("android")
@@ -13,7 +11,7 @@ plugins {
 }
 
 afterEvaluate {
-  extensions.configure<KaptExtension> {
+  kapt {
     javacOptions {
       if (hasDaggerCompilerDependency()) {
         // https://dagger.dev/dev-guide/compiler-options#fastinit-mode
-- 
cgit v1.2.3