Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 674a7d2

Browse files
authored
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
1 parent 43f6a00 commit 674a7d2

File tree

13 files changed

+18
-200
lines changed

13 files changed

+18
-200
lines changed

build-logic/android-plugins/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import org.gradle.api.tasks.compile.JavaCompile
88
import org.gradle.kotlin.dsl.withType
99
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1010

11-
plugins {
12-
`kotlin-dsl`
13-
`kotlin-dsl-precompiled-script-plugins`
14-
}
11+
plugins { `kotlin-dsl` }
1512

1613
afterEvaluate {
1714
tasks.withType<JavaCompile>().configureEach {

build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
76
import flavors.FlavorDimensions
87
import flavors.ProductFlavors
9-
import org.gradle.kotlin.dsl.configure
108
import signing.configureBuildSigning
119

1210
plugins {
@@ -22,7 +20,7 @@ fun Project.isSnapshot(): Boolean {
2220
}
2321
}
2422

25-
extensions.configure<BaseAppModuleExtension> {
23+
android {
2624
val minifySwitch =
2725
project.providers.environmentVariable("DISABLE_MINIFY").forUseAtConfigurationTime()
2826

build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.published-android-library.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
import org.gradle.kotlin.dsl.configure
76
import org.gradle.kotlin.dsl.provideDelegate
8-
import org.gradle.plugins.signing.SigningExtension
97

108
plugins {
119
id("com.github.android-password-store.android-library")
@@ -14,7 +12,7 @@ plugins {
1412
}
1513

1614
afterEvaluate {
17-
extensions.configure<SigningExtension> {
15+
signing {
1816
val signingKey: String? by project
1917
val signingPassword: String? by project
2018
useInMemoryPgpKeys(signingKey, signingPassword)

build-logic/automation-plugins/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import org.gradle.api.tasks.compile.JavaCompile
88
import org.gradle.kotlin.dsl.withType
99
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1010

11-
plugins {
12-
`kotlin-dsl`
13-
`kotlin-dsl-precompiled-script-plugins`
14-
}
11+
plugins { `kotlin-dsl` }
1512

1613
afterEvaluate {
1714
tasks.withType<JavaCompile>().configureEach {

build-logic/kotlin-plugins/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import org.gradle.api.tasks.compile.JavaCompile
88
import org.gradle.kotlin.dsl.withType
99
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1010

11-
plugins {
12-
`kotlin-dsl`
13-
`kotlin-dsl-precompiled-script-plugins`
14-
}
11+
plugins { `kotlin-dsl` }
1512

1613
afterEvaluate {
1714
tasks.withType<JavaCompile>().configureEach {

build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
import kotlinx.validation.ApiValidationExtension
7-
import org.gradle.kotlin.dsl.configure
8-
96
plugins { id("org.jetbrains.kotlinx.binary-compatibility-validator") }
107

11-
extensions.configure<ApiValidationExtension> { ignoredProjects = mutableSetOf("app") }
8+
apiValidation {
9+
ignoredProjects =
10+
mutableSetOf(
11+
"app",
12+
"coroutine-utils",
13+
"coroutine-utils-testing",
14+
"crypto-common",
15+
"crypto-pgpainless",
16+
"format-common",
17+
"diceware",
18+
)
19+
}

build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-kapt.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
*/
55

66
import org.gradle.api.Project
7-
import org.gradle.kotlin.dsl.configure
8-
import org.jetbrains.kotlin.gradle.plugin.KaptExtension
97

108
plugins {
119
kotlin("android")
1210
kotlin("kapt")
1311
}
1412

1513
afterEvaluate {
16-
extensions.configure<KaptExtension> {
14+
kapt {
1715
javacOptions {
1816
if (hasDaggerCompilerDependency()) {
1917
// https://dagger.dev/dev-guide/compiler-options#fastinit-mode

coroutine-utils-testing/api/coroutine-utils-testing.api

Lines changed: 0 additions & 8 deletions
This file was deleted.

coroutine-utils/api/coroutine-utils.api

Lines changed: 0 additions & 22 deletions
This file was deleted.

crypto-common/api/crypto-common.api

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)