Compare commits
2 Commits
7d1d8c551d
...
43008cf0d7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43008cf0d7 | ||
|
|
8d461e2cc4 |
@ -41,7 +41,7 @@ java {
|
|||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
archivesBaseName = 'ssg-api'
|
archiveBaseName = 'ssg-api'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourcesJar {
|
sourcesJar {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'org.asciidoctor.jvm.convert' version '3.3.2'
|
id 'org.asciidoctor.jvm.convert' version '4.0.5'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|||||||
@ -36,7 +36,7 @@ dependencies {
|
|||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion = JavaLanguageVersion.of(21)
|
languageVersion = JavaLanguageVersion.of(25)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
mainClassName = 'com.jessebrault.ssg.StaticSiteGeneratorCli'
|
mainClass = 'com.jessebrault.ssg.StaticSiteGeneratorCli'
|
||||||
applicationName = 'ssg'
|
applicationName = 'ssg'
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ java {
|
|||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
archivesBaseName = 'ssg-cli'
|
archiveBaseName = 'ssg-cli'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourcesJar {
|
sourcesJar {
|
||||||
|
|||||||
@ -68,6 +68,12 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
|
|||||||
)
|
)
|
||||||
boolean dryRun
|
boolean dryRun
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ['--profile'],
|
||||||
|
description = 'Log elapsed times for build steps.'
|
||||||
|
)
|
||||||
|
boolean profile
|
||||||
|
|
||||||
protected StaticSiteGenerator staticSiteGenerator = null
|
protected StaticSiteGenerator staticSiteGenerator = null
|
||||||
|
|
||||||
protected final Integer doSingleBuild(String buildName) {
|
protected final Integer doSingleBuild(String buildName) {
|
||||||
@ -77,6 +83,7 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
|
|||||||
def groovyClassLoader = new GroovyClassLoader(this.class.classLoader)
|
def groovyClassLoader = new GroovyClassLoader(this.class.classLoader)
|
||||||
|
|
||||||
if (this.gradle) {
|
if (this.gradle) {
|
||||||
|
def gradleStartTime = System.currentTimeMillis()
|
||||||
def projectConnection = GradleConnector.newConnector()
|
def projectConnection = GradleConnector.newConnector()
|
||||||
.forProjectDirectory(
|
.forProjectDirectory(
|
||||||
this.commonCliOptions.projectDir.toPath().resolve(this.gradleProjectDir).toFile()
|
this.commonCliOptions.projectDir.toPath().resolve(this.gradleProjectDir).toFile()
|
||||||
@ -97,6 +104,11 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
|
|||||||
|
|
||||||
projectConnection.newBuild().forTasks('ssgJars').run()
|
projectConnection.newBuild().forTasks('ssgJars').run()
|
||||||
projectConnection.close()
|
projectConnection.close()
|
||||||
|
|
||||||
|
if (this.profile) {
|
||||||
|
def gradleElapsedTime = System.currentTimeMillis() - gradleStartTime
|
||||||
|
logger.info("Gradle connection elapsed time: ${gradleElapsedTime / 1000} seconds")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.libDirs.each { libDir ->
|
this.libDirs.each { libDir ->
|
||||||
@ -123,6 +135,8 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def buildStartTime = System.currentTimeMillis()
|
||||||
|
|
||||||
final Collection<Diagnostic> diagnostics = this.staticSiteGenerator.doBuild(
|
final Collection<Diagnostic> diagnostics = this.staticSiteGenerator.doBuild(
|
||||||
this.commonCliOptions.projectDir,
|
this.commonCliOptions.projectDir,
|
||||||
buildName,
|
buildName,
|
||||||
@ -130,6 +144,11 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
|
|||||||
this.scriptArgs ?: [:]
|
this.scriptArgs ?: [:]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def buildElapsedTime = System.currentTimeMillis() - buildStartTime
|
||||||
|
if (this.profile) {
|
||||||
|
logger.info("Build $buildName elapsed time: ${buildElapsedTime / 1000} seconds")
|
||||||
|
}
|
||||||
|
|
||||||
if (!diagnostics.isEmpty()) {
|
if (!diagnostics.isEmpty()) {
|
||||||
diagnostics.each {
|
diagnostics.each {
|
||||||
logger.error(it.message)
|
logger.error(it.message)
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import picocli.CommandLine
|
|||||||
@CommandLine.Command(
|
@CommandLine.Command(
|
||||||
name = 'ssg',
|
name = 'ssg',
|
||||||
mixinStandardHelpOptions = true,
|
mixinStandardHelpOptions = true,
|
||||||
version = '0.4.0',
|
version = '0.6.0-SNAPSHOT',
|
||||||
description = 'A static site generator which can interface with Gradle for high extensibility.',
|
description = 'A static site generator which can interface with Gradle for high extensibility.',
|
||||||
subcommands = [SsgInit, SsgBuild, SsgWatch]
|
subcommands = [SsgInit, SsgBuild, SsgWatch]
|
||||||
)
|
)
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@ -21,6 +21,10 @@ java {
|
|||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType(AbstractTestTask).configureEach {
|
||||||
|
failOnNoDiscoveredTests = false
|
||||||
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
create('ssgGradlePlugin', MavenPublication) {
|
create('ssgGradlePlugin', MavenPublication) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user