diff options
| -rw-r--r-- | .github/workflows/deploy_library_releases.yml | 4 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/.github/workflows/deploy_library_releases.yml b/.github/workflows/deploy_library_releases.yml index 452ae970..ddb61b6f 100644 --- a/.github/workflows/deploy_library_releases.yml +++ b/.github/workflows/deploy_library_releases.yml @@ -25,5 +25,5 @@ jobs: env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_PUBLISH_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.NEXUS_PUBLISH_GPG_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_PUBLISH_GPG_KEY_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.NEXUS_PUBLISH_GPG_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.NEXUS_PUBLISH_GPG_KEY_PASSWORD }} diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt index a0342698..17ab5431 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt @@ -11,9 +11,6 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.provideDelegate -import org.gradle.plugins.signing.SigningExtension -import org.gradle.plugins.signing.SigningPlugin @Suppress("Unused") class PublishedAndroidLibraryPlugin : Plugin<Project> { @@ -22,20 +19,12 @@ class PublishedAndroidLibraryPlugin : Plugin<Project> { project.plugins.run { apply(LibraryPlugin::class) apply(MavenPublishPlugin::class) - apply(SigningPlugin::class) apply("me.tylerbwong.gradle.metalava") } project.extensions.configure<MavenPublishBaseExtension> { publishToMavenCentral(SonatypeHost.DEFAULT, true) signAllPublications() } - project.afterEvaluate { - project.extensions.configure<SigningExtension> { - val signingKey: String? by project - val signingPassword: String? by project - useInMemoryPgpKeys(signingKey, signingPassword) - } - } project.extensions.configure<MetalavaExtension> { documentation.set(Documentation.PUBLIC) inputKotlinNulls.set(true) |