Skip to content

Commit

Permalink
Feature / Build system updates (#478)
Browse files Browse the repository at this point in the history
* Control signing behavior with a Gradle build property

* Fix deprecation warning in main build.gradle

* Fix deprecation warning in plugins build.gradle files
  • Loading branch information
martin-traverse authored Dec 9, 2024
1 parent f52ca0b commit 2058f7c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 9 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ allprojects {

subprojects {

buildDir = rootProject.buildDir.path + '/modules/' + project.name
var buildDir = rootProject.layout.buildDirectory.dir("modules/" + project.name)
layout.buildDirectory.set(buildDir)

// Publishing setup is defined in gradle/publish.gradle
project.afterEvaluate(publishModule)
Expand Down
8 changes: 6 additions & 2 deletions gradle/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,12 @@ def publishModule(Project project) {
}
}

signing {
sign publishing.publications[project.name]
var disableSigning = System.getProperty("disableSigning")

if (disableSigning != "true") {
signing {
sign publishing.publications[project.name]
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion tracdap-plugins/aws-storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ dependencies {
}

// Use a different build dir (don't include plugins in the main release package)
project.buildDir = "${rootProject.buildDir.path}/plugins/${project.name}"
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)
3 changes: 2 additions & 1 deletion tracdap-plugins/azure-storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ dependencies {
}

// Use a different build dir (don't include plugins in the main release package)
project.buildDir = "${rootProject.buildDir.path}/plugins/${project.name}"
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)
3 changes: 2 additions & 1 deletion tracdap-plugins/gcp-config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ configurations.configureEach {
}

// Use a different build dir (don't include plugins in the main release package)
project.buildDir = "${rootProject.buildDir.path}/plugins/${project.name}"
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)
3 changes: 2 additions & 1 deletion tracdap-plugins/gcp-storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ configurations.configureEach {


// Use a different build dir (don't include plugins in the main release package)
project.buildDir = "${rootProject.buildDir.path}/plugins/${project.name}"
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)

3 changes: 2 additions & 1 deletion tracdap-plugins/sql-drivers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ description = "SQL drivers plugin (placeholder, not required for production buil
group = "org.finos.tracdap.plugins"

// Use a different build dir (don't include plugins in the main release package)
project.buildDir = rootProject.buildDir.path + '/plugins/' + project.name
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)

repositories {
mavenCentral()
Expand Down
3 changes: 2 additions & 1 deletion tracdap-plugins/ssh-executor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ description = "Executor plugin for remote execution over SSH"
group = "org.finos.tracdap.plugins"

// Use a different build dir (don't include plugins in the main release package)
project.buildDir = rootProject.buildDir.path + '/plugins/' + project.name
var buildDir = rootProject.layout.buildDirectory.dir("plugins/" + project.name)
layout.buildDirectory.set(buildDir)

dependencies {

Expand Down

0 comments on commit 2058f7c

Please sign in to comment.