Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/gradle-8
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle.kts
  • Loading branch information
philipp94831 committed Mar 11, 2024
2 parents 5b756f9 + 76708a7 commit 2c8efd2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## [1.3.2](https://github.com/bakdata/gradle-plugins/tree/1.3.2) (2024-03-11)
[View commits](https://github.com/bakdata/gradle-plugins/compare/1.3.1...1.3.2)

**Merged pull requests:**

- Fix sign dependencies with multiple publications [\#51](https://github.com/bakdata/gradle-plugins/pull/51) ([@philipp94831](https://github.com/philipp94831))

## [1.3.1](https://github.com/bakdata/gradle-plugins/tree/1.3.1) (2024-03-11)
[View commits](https://github.com/bakdata/gradle-plugins/compare/1.3.0...1.3.1)

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("com.bakdata.release") version "1.3.0"
// eat your own dog food - apply the plugins to this plugin project
id("com.bakdata.sonar") version "1.1.17"
id("com.bakdata.sonatype") version "1.3.1"
id("com.bakdata.sonatype") version "1.3.2"
id("org.gradle.kotlin.kotlin-dsl") version "4.1.2" apply false
id("com.gradle.plugin-publish") version "1.2.1" apply false
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=1.3.2-SNAPSHOT
version=1.3.3-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import org.gradle.api.GradleException
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.attributes.DocsType.JAVADOC
import org.gradle.api.logging.Logging
import org.gradle.api.plugins.JavaPlugin
import org.gradle.api.plugins.JavaPluginExtension
Expand All @@ -38,8 +37,6 @@ import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
import org.gradle.api.publish.maven.tasks.GenerateMavenPom
import org.gradle.api.publish.maven.tasks.PublishToMavenLocal
import org.gradle.api.publish.plugins.PublishingPlugin
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.bundling.Jar
import org.gradle.kotlin.dsl.*
import org.gradle.plugins.signing.Sign
Expand Down Expand Up @@ -245,7 +242,7 @@ class SonatypePlugin : Plugin<Project> {
sign(the<PublishingExtension>().publications)
}

tasks.named(PublishingPlugin.PUBLISH_LIFECYCLE_TASK_NAME) { dependsOn(tasks.withType<Sign>()) }
tasks.matching { it is AbstractPublishToMaven }.all { dependsOn(tasks.withType<Sign>()) }
}
}

Expand Down

0 comments on commit 2c8efd2

Please sign in to comment.