Skip to content

Commit 82f4764

Browse files
committed
Github action workflow changes and dependencies for jspecify nullability
1 parent ad04176 commit 82f4764

File tree

4 files changed

+63
-8
lines changed

4 files changed

+63
-8
lines changed

.github/dependabot.yml

+44
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
version: 2
22
updates:
33
- package-ecosystem: gradle
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
day: saturday
8+
ignore:
9+
- dependency-name: '*'
10+
update-types:
11+
- version-update:semver-major
12+
- version-update:semver-minor
13+
open-pull-requests-limit: 10
14+
labels:
15+
- 'type: dependency-upgrade'
16+
groups:
17+
development-dependencies:
18+
update-types:
19+
- patch
20+
patterns:
21+
- com.gradle.*
22+
- io.spring.*
23+
- org.ajoberstar.grgit
24+
- org.antora
25+
- io.micrometer:micrometer-docs-generator
26+
- org.hibernate.validator:hibernate-validator
27+
- org.awaitility:awaitility
28+
- net.ltgt.errorprone
29+
- com.uber.nullaway*
30+
- org.springframework.boot*
31+
- com.google.errorprone*
32+
33+
- package-ecosystem: gradle
34+
target-branch: 3.3.x
435
directory: /
536
schedule:
637
interval: weekly
@@ -69,6 +100,19 @@ updates:
69100
patterns:
70101
- '*'
71102

103+
- package-ecosystem: github-actions
104+
target-branch: 3.3.x
105+
directory: /
106+
schedule:
107+
interval: weekly
108+
day: saturday
109+
labels:
110+
- 'type: task'
111+
groups:
112+
development-dependencies:
113+
patterns:
114+
- '*'
115+
72116
- package-ecosystem: github-actions
73117
target-branch: 3.2.x
74118
directory: /

.github/workflows/merge-dependabot-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
merge-dependabot-pr:
1313
permissions: write-all
1414

15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v5
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
1616
with:
1717
mergeArguments: --auto --squash
18-
autoMergeSnapshots: true
18+
autoMergeSnapshots: true

.github/workflows/release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
issues: write
1414

1515
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
16+
with:
17+
deployMilestoneToCentral: true
1618
secrets:
1719
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
1820
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

build.gradle

+15-6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ plugins {
2222
id 'io.spring.dependency-management' version '1.1.7' apply false
2323
id 'com.github.spotbugs' version '6.1.2'
2424
id 'io.freefair.aggregate-javadoc' version '8.11'
25+
id 'net.ltgt.errorprone' version '4.1.0' apply false
2526
}
2627

2728
apply plugin: 'io.spring.nohttp'
@@ -127,6 +128,7 @@ configure(javaProjects) { subproject ->
127128
apply plugin: 'checkstyle'
128129
apply plugin: 'kotlin'
129130
apply plugin: 'kotlin-spring'
131+
apply plugin: 'net.ltgt.errorprone'
130132

131133
apply from: "${rootProject.projectDir}/gradle/publish-maven.gradle"
132134

@@ -141,14 +143,18 @@ configure(javaProjects) { subproject ->
141143
}
142144
}
143145

144-
compileJava {
145-
options.release = 17
146-
}
147-
148-
compileTestJava {
146+
tasks.withType(JavaCompile).configureEach {
149147
sourceCompatibility = JavaVersion.VERSION_17
150-
targetCompatibility = JavaVersion.VERSION_17
151148
options.encoding = 'UTF-8'
149+
options.errorprone {
150+
disableAllChecks = true
151+
if (!name.toLowerCase().contains('test')) {
152+
option('NullAway:OnlyNullMarked', 'true')
153+
option('NullAway:CustomContractAnnotations', 'org.springframework.lang.Contract')
154+
option('NullAway:JSpecifyMode', 'true')
155+
error('NullAway')
156+
}
157+
}
152158
}
153159

154160
compileTestKotlin {
@@ -185,6 +191,9 @@ configure(javaProjects) { subproject ->
185191
}
186192
testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion"
187193
optionalApi "org.assertj:assertj-core:$assertjVersion"
194+
195+
errorprone 'com.uber.nullaway:nullaway:0.12.3'
196+
errorprone 'com.google.errorprone:error_prone_core:2.36.0'
188197
}
189198

190199
// enable all compiler warnings; individual projects may customize further

0 commit comments

Comments
 (0)