Skip to content

Commit

Permalink
- enabling configuration cache
Browse files Browse the repository at this point in the history
- removing `project` reference in Sign.configureEach as this was disrupting the configuration cache
- removing empty lines
- commenting out unused variables
- fixing imports
  • Loading branch information
elect86 committed Sep 27, 2024
1 parent 2278f8b commit e68c073
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
11 changes: 7 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import org.gradle.kotlin.dsl.implementation
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URL
import sciview.*
import sciview.lwjglNatives

plugins {
java
Expand Down Expand Up @@ -184,7 +182,7 @@ tasks {

withType<GenerateMavenPom>().configureEach {
val scijavaParentPomVersion = project.properties["scijavaParentPOMVersion"]
val matcher = Regex("""generatePomFileFor(\w+)Publication""").matchEntire(name)
// val matcher = Regex("""generatePomFileFor(\w+)Publication""").matchEntire(name)
// val publicationName = matcher?.let { it.groupValues[1] }

pom.properties.empty()
Expand Down Expand Up @@ -477,3 +475,8 @@ task<Copy>("copyDependencies") {
}

java.withSourcesJar()

//extensions.findByName("buildScan")?.withGroovyBuilder {
// setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
// setProperty("termsOfServiceAgree", "yes")
//}
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ repositories {
dependencies {
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
implementation("de.undercouch:gradle-download-task:5.6.0")

}
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/sciview/sign.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ signing {
}

tasks.withType<Sign>().configureEach {
onlyIf { project.hasProperty("release") }
val isRelease = hasProperty("release")
onlyIf { isRelease }
}

2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
org.gradle.caching=true
org.gradle.configuration-cache=true
#org.gradle.caching.debug=true
jvmTarget=21
#useLocalScenery=true
kotlinVersion=1.9.23
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ if (System.getProperty("CI").toBoolean() != true
if(File("../scenery/build.gradle.kts").exists()) {
logger.warn("Including local scenery project instead of version declared in build, set -PuseLocalScenery=false to use declared version instead.")
includeBuild("../scenery")
}
}

0 comments on commit e68c073

Please sign in to comment.