Skip to content

chore: refactor the examples and gradle plugin projects as separate builds #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeromy-cannon merged 5 commits into from
Oct 17, 2023
Merged

chore: refactor the examples and gradle plugin projects as separate builds #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac8606c
compiling without examples using gradle plugin
jeromy-cannon Oct 11, 2023
c1e597a
code that should work?
jeromy-cannon Oct 11, 2023
d8ffe92
chore: break plugin and examples into separate root projects
nathanklick Oct 16, 2023
de9d154
chore: fix spotless
nathanklick Oct 16, 2023
eea7c64
Merge branch 'main' into 00396-gradle-swap-examples-and-plugin
jeromy-cannon Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.jpms-modules.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ plugins {
javaModuleDependencies {
moduleNameToGA.put("com.hedera.fullstack.junit.support", "com.hedera.fullstack:fullstack-junit-support")
moduleNameToGA.put("com.hedera.fullstack.test.toolkit", "com.hedera.fullstack:fullstack-test-toolkit")
moduleNameToGA.put("com.hedera.fullstack.readiness.api", "com.hedera.fullstack:fullstack-readiness-api")
moduleNameToGA.put("com.hedera.fullstack.monitoring.api", "com.hedera.fullstack:fullstack-monitoring-api")
moduleNameToGA.put("com.hedera.fullstack.validator.api", "com.hedera.fullstack:fullstack-validator-api")
}

extraJavaModuleInfo {
Expand Down
2 changes: 1 addition & 1 deletion fullstack-bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies.constraints {

for (p in rootProject.childProjects) {
val isPublished = p.value.findProperty("mavenPublishingEnabled")?.toString()?.toBoolean() ?: false
val excludedProjects = listOf(project.name, project(":fullstack-gradle-plugin").name)
val excludedProjects = listOf(project.name)
if (isPublished && !excludedProjects.contains(p.value.name)) {
api(project(p.value.path))
}
Expand Down
8 changes: 2 additions & 6 deletions fullstack-examples/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,15 @@ import com.hedera.fullstack.gradle.plugin.HelmTestChartTask
import com.hedera.fullstack.gradle.plugin.HelmUninstallChartTask

plugins {
id("java")
id("com.hedera.fullstack.root")
id("com.hedera.fullstack.conventions")
id("com.hedera.fullstack.jpms-modules")
id("com.hedera.fullstack.fullstack-gradle-plugin")
}

dependencies {
api(platform("com.hedera.fullstack:fullstack-bom"))
implementation("com.hedera.fullstack:fullstack-readiness-api")
implementation("com.hedera.fullstack:fullstack-monitoring-api")
implementation("com.hedera.fullstack:fullstack-test-toolkit")
implementation("com.hedera.fullstack:fullstack-validator-api")
// Bill of Materials
implementation(platform("com.hedera.fullstack:fullstack-bom"))
}

tasks.register<HelmInstallChartTask>("helmInstallFstChart") {
Expand Down
Binary file added fullstack-examples/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions fullstack-examples/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
249 changes: 249 additions & 0 deletions fullstack-examples/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 92 additions & 0 deletions fullstack-examples/gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading