From a73824f5035c2e664599701f510e2159bcc8f9f6 Mon Sep 17 00:00:00 2001 From: David Edey Date: Sun, 24 Apr 2022 23:33:25 +0100 Subject: [PATCH] Updated names for gradle projects --- build.gradle | 55 ++++++++++++++--------------- cli-tools/build.gradle | 4 +-- docker/scripts/rundocker.sh | 2 +- radixdlt-core/radixdlt/build.gradle | 12 +++---- radixdlt-engine/build.gradle | 2 +- settings.gradle | 18 +++++----- sonar-project.properties | 4 +-- 7 files changed, 48 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index 0e3f343391..375e531a74 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ if (System.getenv("CI_VERSION")){ task printShadowJarFilePath { doLast { - print project(':radixdlt').shadowJar.archiveFile.get() + print project(':core').shadowJar.archiveFile.get() } } @@ -125,33 +125,6 @@ sonarqube { } allprojects { - - apply plugin: "com.diffplug.spotless" - - spotless { - format 'misc', { - // define the files to apply `misc` to - target '*.gradle', '*.md', '.gitignore' - - // define the steps to apply to those files - trimTrailingWhitespace() - indentWithSpaces() // Takes an integer argument if you don't like 4 - endWithNewline() - } - java { - // don't need to set target, it is inferred from java - targetExclude('**/openapitools/**/*.java') - // apply a specific flavor of google-java-format - googleJavaFormat('1.13.0').reflowLongStrings() - - - // make sure every file has the following copyright header. - // optionally, Spotless can set copyright years by digging - // through git history (see "license" section below) - licenseHeaderFile("${project.rootDir}/licence-header.txt") - } - } - repositories { mavenCentral() maven { @@ -189,6 +162,32 @@ allprojects { } subprojects { + apply plugin: "com.diffplug.spotless" + + spotless { + format 'misc', { + // define the files to apply `misc` to + target '*.gradle', '*.md', '.gitignore' + + // define the steps to apply to those files + trimTrailingWhitespace() + indentWithSpaces() // Takes an integer argument if you don't like 4 + endWithNewline() + } + java { + // don't need to set target, it is inferred from java + targetExclude('**/openapitools/**/*.java') + // apply a specific flavor of google-java-format + googleJavaFormat('1.13.0').reflowLongStrings() + + + // make sure every file has the following copyright header. + // optionally, Spotless can set copyright years by digging + // through git history (see "license" section below) + licenseHeaderFile("${project.rootDir}/licence-header.txt") + } + } + apply plugin: "maven-publish" sonarqube { diff --git a/cli-tools/build.gradle b/cli-tools/build.gradle index 9d2592c93d..1068976917 100644 --- a/cli-tools/build.gradle +++ b/cli-tools/build.gradle @@ -72,7 +72,7 @@ compileTestJava { } dependencies { - implementation project(':radixdlt-java-common') + implementation project(':common') implementation 'commons-cli:commons-cli' @@ -99,7 +99,7 @@ def nodeNames = project.getProperties().get('nodeNames', "") task generateNodeKey(type: Exec) { dependsOn compileJava - dependsOn ':radixdlt-java-common:jar' + dependsOn ':common:jar' group = "Execution" description = "Generate Node key" diff --git a/docker/scripts/rundocker.sh b/docker/scripts/rundocker.sh index 2013116362..58bdcdf5d1 100755 --- a/docker/scripts/rundocker.sh +++ b/docker/scripts/rundocker.sh @@ -19,7 +19,7 @@ fi reporoot="${scriptdir}/../.." # Load environment -eval $(${reporoot}/gradlew -q -p "${reporoot}/radixdlt-core/radixdlt" -P "validators=${validators}" :radixdlt:clean :radixdlt:generateDevUniverse) +eval $(${reporoot}/gradlew -q -p "${reporoot}/radixdlt-core/radixdlt" -P "validators=${validators}" :core:clean :core:generateDevUniverse) # Launch ${reporoot}/gradlew -p "${reporoot}" deb4docker && \ diff --git a/radixdlt-core/radixdlt/build.gradle b/radixdlt-core/radixdlt/build.gradle index cb95749925..100ce69a33 100644 --- a/radixdlt-core/radixdlt/build.gradle +++ b/radixdlt-core/radixdlt/build.gradle @@ -171,8 +171,8 @@ jacocoTestReport { dependencies { // If dependencies on other projects appear, do not forget to update // generateDevUniverse task to depend on those projects - implementation project(':radixdlt-engine') - implementation project(':radixdlt-java-common') + implementation project(':engine') + implementation project(':common') implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'io.swagger:swagger-annotations:1.5.0' @@ -219,8 +219,8 @@ task generateDevUniverse(type: Exec) { //Alternative solution (slower, but does not require manual maintenance): //dependsOn tasks.withType(Jar) - dependsOn ':radixdlt-java-common:jar' - dependsOn ':radixdlt-engine:jar' + dependsOn ':common:jar' + dependsOn ':engine:jar' group = "Execution" description = "Generate development universe" commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(), @@ -230,8 +230,8 @@ task generateDevUniverse(type: Exec) { task generateGenesisFile(type: Exec) { dependsOn compileJava - dependsOn ':radixdlt-java-common:jar' - dependsOn ':radixdlt-engine:jar' + dependsOn ':common:jar' + dependsOn ':engine:jar' group = "Execution" description = "Generate development universe" commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(), diff --git a/radixdlt-engine/build.gradle b/radixdlt-engine/build.gradle index a951498f71..8912bef599 100644 --- a/radixdlt-engine/build.gradle +++ b/radixdlt-engine/build.gradle @@ -65,7 +65,7 @@ apply plugin: 'java-library' dependencies { - api project(':radixdlt-java-common') + api project(':common') testImplementation 'junit:junit' testImplementation 'org.mockito:mockito-core' diff --git a/settings.gradle b/settings.gradle index 7e60ef5faf..c0aebc1d24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ -rootProject.name='radixdlt-parent' -include ':radixdlt' -include ':radixdlt-cli' -include ':radixdlt-engine' -include ':radixdlt-java-common' +rootProject.name='java-node' +include ':core' +include ':cli-tools' +include ':engine' +include ':common' -project(':radixdlt').projectDir = new File('radixdlt-core/radixdlt') -project(':radixdlt-cli').projectDir = new File('radixdlt-java/radixdlt-cli') -project(':radixdlt-engine').projectDir = new File('radixdlt-engine') -project(':radixdlt-java-common').projectDir = new File('radixdlt-java-common') +project(':core').projectDir = new File('radixdlt-core/radixdlt') +project(':cli-tools').projectDir = new File('cli-tools') +project(':engine').projectDir = new File('radixdlt-engine') +project(':common').projectDir = new File('radixdlt-java-common') diff --git a/sonar-project.properties b/sonar-project.properties index 96b47bc495..91aa086a99 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ # must be unique in a given SonarQube instance -sonar.projectKey=com.radixdlt:radixdlt-parent +sonar.projectKey=com.radixdlt:java-node # Encoding of the source code. Default is default system encoding sonar.sourceEncoding=UTF-8 -sonar.projectName=radixdlt-parent +sonar.projectName=java-node