Skip to content

Commit def0932

Browse files
chore(internal): gradlew v8.7, use gradle task config avoidance APIs (#198)
1 parent 372a3e6 commit def0932

9 files changed

Lines changed: 60 additions & 39 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333

3434
- name: Gradle build
3535
run: |
36-
./gradlew build testClasses -x test
36+
./gradlew --build-cache --parallel --no-daemon \
37+
build testClasses -x test
3738
3839

.github/workflows/publish-sonatype.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Publish to Sonatype
3232
run: |
33-
./gradlew publish --stacktrace
33+
./gradlew --parallel --no-daemon publish
3434
env:
3535
SONATYPE_USERNAME: ${{ secrets.FINCH_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }}
3636
SONATYPE_PASSWORD: ${{ secrets.FINCH_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }}

buildSrc/src/main/kotlin/finch.java.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ java {
3030
}
3131
}
3232

33-
tasks.withType<JavaCompile> {
33+
tasks.withType<JavaCompile>().configureEach {
3434
options.compilerArgs.add("-Werror")
3535
options.release.set(8)
3636
}
@@ -39,7 +39,7 @@ tasks.named<Jar>("javadocJar") {
3939
setZip64(true)
4040
}
4141

42-
tasks.jar {
42+
tasks.named<Jar>("jar") {
4343
manifest {
4444
attributes(mapOf(
4545
"Implementation-Title" to project.name,
@@ -48,7 +48,7 @@ tasks.jar {
4848
}
4949
}
5050

51-
tasks.test {
51+
tasks.named<Test>("test") {
5252
useJUnitPlatform()
5353

5454
testLogging {

buildSrc/src/main/kotlin/finch.kotlin.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ configure<SpotlessExtension> {
1818
}
1919
}
2020

21-
tasks.withType<KotlinCompile> {
21+
tasks.withType<KotlinCompile>().configureEach {
2222
kotlinOptions {
2323
allWarningsAsErrors = true
2424
freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=1.8")

buildSrc/src/main/kotlin/finch.publish.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.gradle.api.publish.PublishingExtension
22
import org.gradle.api.publish.maven.MavenPublication
33
import org.gradle.kotlin.dsl.configure
4-
import org.gradle.kotlin.dsl.create
4+
import org.gradle.kotlin.dsl.register
55
import org.gradle.kotlin.dsl.get
66

77
plugins {
@@ -11,7 +11,7 @@ plugins {
1111

1212
configure<PublishingExtension> {
1313
publications {
14-
create<MavenPublication>("maven") {
14+
register<MavenPublication>("maven") {
1515
from(components["java"])
1616

1717
pom {
@@ -62,6 +62,6 @@ signing {
6262
}
6363
}
6464

65-
tasks.publish {
65+
tasks.named("publish") {
6666
dependsOn(":closeAndReleaseSonatypeStagingRepository")
6767
}

gradle/wrapper/gradle-wrapper.jar

-16 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 19 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)