Skip to content

Commit

Permalink
tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fishinitself committed Jun 20, 2024
1 parent 874c3bf commit 8687bff
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ plugins {

allprojects {
group = 'org.octopusden.rm.ft'
apply plugin: "org.octopusden.octopus-release-management"
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'java-library'
id 'org.octopusden.octopus-release-management'
}

releaseManagement {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'java-library'
id 'org.octopusden.octopus-release-management'
}

releaseManagement {
Expand All @@ -12,6 +13,7 @@ releaseManagement {
apply plugin: 'maven-publish'
apply plugin: 'java-library'


java {
withJavadocJar()
withSourcesJar()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'java-library'
id 'org.octopusden.octopus-release-management'
}

releaseManagement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ class ReleaseManagementGradlePlugin implements Plugin<Project> {
def exportDependenciesToTeamcitySpecified = project.gradle.startParameter.taskNames.any { it.endsWith("exportDependenciesToTeamcity") }

if (!exportDependenciesToTeamcitySpecified && !rootProject.gradle.startParameter.offline && !project.rootProject.extensions.extraProperties.escrowBuild) {
def releaseManagementDependenciesExtension = project.rootProject.extensions.getByType(ReleaseManagementDependenciesExtension.class)
def releaseManagementDependenciesExtension = project.extensions.getByType(ReleaseManagementDependenciesExtension.class)
if (releaseManagementDependenciesExtension.releaseDependenciesConfiguration.isTouched() || rootProject.findProperty("includeAllDependencies")?.toString()?.equalsIgnoreCase("true")) {
if (releaseManagementDependenciesExtension.releaseDependenciesConfiguration.autoRegistration || rootProject.hasProperty("buildVersion")) {
def exportDependenciesToTeamcityTask = rootProject.getTasksByName("exportDependenciesToTeamcity", false)[0] as ExportDependenciesToTeamcityTask
def exportDependenciesToTeamcityTask = project.getTasksByName("exportDependenciesToTeamcity", false)[0] as ExportDependenciesToTeamcityTask
rootProject.gradle.buildFinished { BuildResult buildResult ->
if (buildResult.failure == null) {
exportDependenciesToTeamcityTask.exportDependencies()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ public void setExcludedConfigurations(List<String> excludedConfigurations) {
public void exportDependencies() {
printProperties();

final ReleaseManagementDependenciesExtension releaseManagementDependenciesExtension = (ReleaseManagementDependenciesExtension) getProject()
.getRootProject()
final ReleaseManagementDependenciesExtension releaseManagementDependenciesExtension = getProject()
.getProject()
.getExtensions()
.findByName("releaseManagement");
.getByType(ReleaseManagementDependenciesExtension.class);

final ReleaseDependenciesConfiguration releaseDependenciesConfiguration = (ReleaseDependenciesConfiguration) releaseManagementDependenciesExtension.getReleaseDependenciesConfiguration();

Expand Down

0 comments on commit 8687bff

Please sign in to comment.