Skip to content

Commit 155d4a9

Browse files
elect86skalarproduktraum
authored andcommitted
- enabling configuration cache
- removing `project` reference in Sign.configureEach as this was disrupting the configuration cache - removing empty lines - commenting out unused variables - fixing imports
1 parent d9a3705 commit 155d4a9

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import org.gradle.kotlin.dsl.implementation
21
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3-
import java.net.URL
4-
import sciview.*
2+
import sciview.lwjglNatives
53

64
plugins {
75
java
@@ -181,7 +179,7 @@ tasks {
181179

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

187185
pom.properties.empty()
@@ -474,3 +472,8 @@ task<Copy>("copyDependencies") {
474472
}
475473

476474
java.withSourcesJar()
475+
476+
//extensions.findByName("buildScan")?.withGroovyBuilder {
477+
// setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
478+
// setProperty("termsOfServiceAgree", "yes")
479+
//}

buildSrc/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ repositories {
1111
dependencies {
1212
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
1313
implementation("de.undercouch:gradle-download-task:5.6.0")
14-
1514
}

buildSrc/src/main/kotlin/sciview/sign.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ signing {
1616
}
1717

1818
tasks.withType<Sign>().configureEach {
19-
onlyIf { project.hasProperty("release") }
19+
val isRelease = hasProperty("release")
20+
onlyIf { isRelease }
2021
}
2122

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
22
org.gradle.caching=true
3+
org.gradle.configuration-cache=true
4+
#org.gradle.caching.debug=true
35
jvmTarget=21
46
#useLocalScenery=true
57
kotlinVersion=1.9.23

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ if (System.getProperty("CI").toBoolean() != true
3131
if(File("../scenery/build.gradle.kts").exists()) {
3232
logger.warn("Including local scenery project instead of version declared in build, set -PuseLocalScenery=false to use declared version instead.")
3333
includeBuild("../scenery")
34-
}
34+
}

0 commit comments

Comments
 (0)