Skip to content

Commit 70c1ff2

Browse files
authored
Fix Gradle configurations in data-loader module (#2742)
1 parent 3b44fc7 commit 70c1ff2

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

data-loader/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ subprojects {
22
ext {
33
jacksonVersion = '2.17.0'
44
}
5-
group = "scalardb.dataloader"
65
dependencies {
76
// AssertJ
87
testImplementation("org.assertj:assertj-core:${assertjVersion}")

data-loader/cli/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ application {
99
mainClass = 'com.scalar.db.dataloader.cli.DataLoaderCli'
1010
}
1111

12-
archivesBaseName = "scalardb-data-loader-cli"
12+
base {
13+
archivesName = "scalardb-data-loader-cli"
14+
}
1315

1416
dependencies {
1517
implementation project(':core')
16-
implementation project(':data-loader:core')
18+
implementation project(':data-loader:data-loader-core')
1719
implementation "org.slf4j:slf4j-simple:${slf4jVersion}"
1820
implementation "info.picocli:picocli:${picocliVersion}"
1921

data-loader/core/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ plugins {
77
id 'base'
88
}
99

10-
archivesBaseName = "scalardb-data-loader-core"
10+
base {
11+
archivesName = "scalardb-data-loader-core"
12+
}
1113

1214
dependencies {
1315
// ScalarDB core
@@ -45,12 +47,6 @@ spotbugsTest.reports {
4547
}
4648
spotbugsTest.excludeFilter = file("${project.rootDir}/gradle/spotbugs-exclude.xml")
4749

48-
if (project.gradle.startParameter.taskNames.any { it.endsWith('publish') } ||
49-
project.gradle.startParameter.taskNames.any { it.endsWith('publishToMavenLocal') }) {
50-
// not to publish the fat jar to maven central
51-
shadowJar.enabled = false
52-
}
53-
5450
publishing {
5551
publications {
5652
mavenJava(MavenPublication) {

settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ include 'schema-loader'
44
include 'integration-test'
55
include 'data-loader:core'
66
include 'data-loader:cli'
7+
8+
// This is a workaround for an issue where projects with the same name lead to unintended conflict.
9+
// See https://github.com/gradle/gradle/issues/847 for the details
10+
findProject(':data-loader:core')?.name = 'data-loader-core'

0 commit comments

Comments
 (0)