Skip to content

Commit cb5a603

Browse files
nedtwiggnedtwigg
committed
Merge branch 'main' into patch-1
2 parents 0be2844 + 8f8951e commit cb5a603

File tree

398 files changed

+15483
-2288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

398 files changed

+15483
-2288
lines changed

‎.circleci/config.yml

Lines changed: 23 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
win: circleci/windows@2.4.0
3+
win: circleci/windows@5.0.0
44

55
anchors:
66
env_gradle: &env_gradle
@@ -34,14 +34,23 @@ anchors:
3434
- *restore_cache_wrapper
3535
- *restore_cache_deps
3636
- run:
37-
name: gradlew check
38-
command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check --build-cache
37+
name: gradlew check -x spotlessCheck
38+
command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check -x spotlessCheck --build-cache
3939
- store_test_results:
4040
path: testlib/build/test-results/test
4141
- store_test_results:
4242
path: lib-extra/build/test-results/test
4343
- store_test_results:
4444
path: plugin-gradle/build/test-results/test
45+
- store_artifacts:
46+
path: lib/build/spotbugs
47+
- store_artifacts:
48+
path: lib-extra/build/spotbugs
49+
- store_artifacts:
50+
path: testlib/build/spotbugs
51+
- store_artifacts:
52+
path: plugin-gradle/build/spotbugs
53+
4554
jobs:
4655
# gradlew spotlessCheck assemble testClasses
4756
assemble_testClasses:
@@ -68,11 +77,11 @@ jobs:
6877
docker:
6978
- image: cimg/openjdk:11.0
7079
<<: *test_nomaven
71-
test_nomaven_15:
72-
# latest JDK, replace with 16 when it comes out
80+
test_nomaven_17:
81+
# latest JDK
7382
<<: *env_gradle_large
7483
docker:
75-
- image: cimg/openjdk:15.0
84+
- image: cimg/openjdk:17.0
7685
<<: *test_nomaven
7786
test_justmaven_11:
7887
<< : *env_gradle
@@ -99,31 +108,23 @@ jobs:
99108
- *restore_cache_wrapper
100109
- *restore_cache_deps
101110
- run:
102-
name: gradlew npmTest
103-
command: ./gradlew npmTest --build-cache
111+
name: gradlew testNpm
112+
command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew testNpm --build-cache
104113
- store_test_results:
105-
path: testlib/build/test-results/NpmTest
114+
path: testlib/build/test-results/testNpm
106115
- store_test_results:
107-
path: plugin-maven/build/test-results/NpmTest
116+
path: plugin-maven/build/test-results/testNpm
108117
- store_test_results:
109-
path: plugin-gradle/build/test-results/NpmTest
118+
path: plugin-gradle/build/test-results/testNpm
110119
- run:
111-
name: gradlew check
112-
command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check --build-cache
120+
name: gradlew test
121+
command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew test --build-cache
113122
- store_test_results:
114123
path: testlib/build/test-results/test
115124
- store_test_results:
116125
path: lib-extra/build/test-results/test
117126
- store_test_results:
118127
path: plugin-gradle/build/test-results/test
119-
- store_artifacts:
120-
path: lib/build/spotbugs
121-
- store_artifacts:
122-
path: lib-extra/build/spotbugs
123-
- store_artifacts:
124-
path: testlib/build/spotbugs
125-
- store_artifacts:
126-
path: plugin-gradle/build/spotbugs
127128
test_windows:
128129
executor:
129130
name: win/default
@@ -139,128 +140,6 @@ jobs:
139140
path: lib-extra/build/test-results/test
140141
- store_test_results:
141142
path: plugin-gradle/build/test-results/test
142-
- run:
143-
name: gradlew npmTest
144-
command: gradlew npmTest --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
145-
- store_test_results:
146-
path: testlib/build/test-results/NpmTest
147-
- store_test_results:
148-
path: plugin-gradle/build/test-results/NpmTest
149-
changelog_print:
150-
<< : *env_gradle
151-
steps:
152-
- checkout
153-
- *restore_cache_wrapper
154-
- *restore_cache_deps
155-
- run:
156-
name: gradlew changelogPrint
157-
command: ./gradlew changelogPrint
158-
do_release_all:
159-
<< : *env_gradle
160-
steps:
161-
- checkout
162-
- *restore_cache_wrapper
163-
- *restore_cache_deps
164-
- *set_git_origin_to_https
165-
- run:
166-
name: gradlew :changelogPush
167-
command: ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
168-
- run:
169-
name: gradlew :plugin-gradle:changelogPush
170-
command: ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${gradle_key} -Pgradle.publish.secret=${gradle_secret} --stacktrace --warning-mode all
171-
- run:
172-
name: gradlew :plugin-maven:changelogPush
173-
command: ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
174-
do_release_lib:
175-
<< : *env_gradle
176-
steps:
177-
- checkout
178-
- *restore_cache_wrapper
179-
- *restore_cache_deps
180-
- *set_git_origin_to_https
181-
- run:
182-
name: gradlew :changelogPush
183-
command: ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
184-
do_release_plugin_gradle:
185-
<< : *env_gradle
186-
steps:
187-
- checkout
188-
- *restore_cache_wrapper
189-
- *restore_cache_deps
190-
- *set_git_origin_to_https
191-
- run:
192-
name: gradlew :plugin-gradle:changelogPush
193-
command: ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${gradle_key} -Pgradle.publish.secret=${gradle_secret} --stacktrace
194-
do_release_plugin_maven:
195-
<< : *env_gradle
196-
steps:
197-
- checkout
198-
- *restore_cache_wrapper
199-
- *restore_cache_deps
200-
- *set_git_origin_to_https
201-
- run:
202-
name: gradlew :plugin-maven:changelogPush
203-
command: ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace
204-
ext_changelog_print:
205-
<< : *env_gradle
206-
steps:
207-
- checkout
208-
- *restore_cache_wrapper
209-
- *restore_cache_deps
210-
- *set_git_origin_to_https
211-
- run:
212-
name: gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
213-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
214-
ext_do_release_base:
215-
<< : *env_gradle
216-
steps:
217-
- checkout
218-
- *restore_cache_wrapper
219-
- *restore_cache_deps
220-
- *set_git_origin_to_https
221-
- run:
222-
name: gradlew :eclipse-base:changelogPush
223-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-base:changelogPush -Prelease=true --stacktrace
224-
ext_do_release_jdt:
225-
<< : *env_gradle
226-
steps:
227-
- checkout
228-
- *restore_cache_wrapper
229-
- *restore_cache_deps
230-
- *set_git_origin_to_https
231-
- run:
232-
name: gradlew :eclipse-jdt:changelogPush
233-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-jdt:changelogPush -Prelease=true --stacktrace
234-
ext_do_release_cdt:
235-
<< : *env_gradle
236-
steps:
237-
- checkout
238-
- *restore_cache_wrapper
239-
- *restore_cache_deps
240-
- *set_git_origin_to_https
241-
- run:
242-
name: gradlew :eclipse-cdt:changelogPush
243-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.cdt=true :eclipse-cdt:changelogPush -Prelease=true --stacktrace
244-
ext_do_release_groovy:
245-
<< : *env_gradle
246-
steps:
247-
- checkout
248-
- *restore_cache_wrapper
249-
- *restore_cache_deps
250-
- *set_git_origin_to_https
251-
- run:
252-
name: gradlew :eclipse-groovy:changelogPush
253-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.groovy=true :eclipse-groovy:changelogPush -Prelease=true --stacktrace
254-
ext_do_release_wtp:
255-
<< : *env_gradle
256-
steps:
257-
- checkout
258-
- *restore_cache_wrapper
259-
- *restore_cache_deps
260-
- *set_git_origin_to_https
261-
- run:
262-
name: gradlew :eclipse-wtp:changelogPush
263-
command: ./gradlew -Pcom.diffplug.spotless.include.ext.wtp=true :eclipse-wtp:changelogPush -Prelease=true --stacktrace
264143

265144
workflows:
266145
version: 2
@@ -274,111 +153,9 @@ workflows:
274153
- test_nomaven_11:
275154
requires:
276155
- assemble_testClasses
277-
- test_nomaven_15:
156+
- test_nomaven_17:
278157
requires:
279158
- assemble_testClasses
280159
- test_npm_8:
281160
requires:
282161
- assemble_testClasses
283-
deploy:
284-
jobs:
285-
- changelog_print:
286-
filters:
287-
branches:
288-
only: main
289-
- release_all:
290-
type: approval
291-
requires:
292-
- changelog_print
293-
- do_release_all:
294-
requires:
295-
- release_all
296-
context:
297-
- SonatypeDeploy
298-
- release_plugin_gradle:
299-
type: approval
300-
requires:
301-
- changelog_print
302-
- do_release_plugin_gradle:
303-
requires:
304-
- release_plugin_gradle
305-
context:
306-
- SonatypeDeploy
307-
- release_plugin_maven:
308-
type: approval
309-
requires:
310-
- changelog_print
311-
- do_release_plugin_maven:
312-
requires:
313-
- release_plugin_maven
314-
context:
315-
- SonatypeDeploy
316-
- release_lib:
317-
type: approval
318-
requires:
319-
- changelog_print
320-
- do_release_lib:
321-
requires:
322-
- release_lib
323-
context:
324-
- SonatypeDeploy
325-
ext_deploy:
326-
jobs:
327-
- ext_changelog_print:
328-
filters:
329-
branches:
330-
only: main
331-
- ext_release_base:
332-
type: approval
333-
requires:
334-
- ext_changelog_print
335-
- ext_do_release_base:
336-
requires:
337-
- ext_release_base
338-
context:
339-
- SonatypeDeploy
340-
- ext_release_jdt:
341-
type: approval
342-
requires:
343-
- ext_changelog_print
344-
- ext_do_release_jdt:
345-
requires:
346-
- ext_release_jdt
347-
context:
348-
- SonatypeDeploy
349-
- ext_release_cdt:
350-
type: approval
351-
requires:
352-
- ext_changelog_print
353-
- ext_do_release_cdt:
354-
filters:
355-
branches:
356-
only: main
357-
requires:
358-
- ext_release_cdt
359-
context:
360-
- SonatypeDeploy
361-
- ext_release_groovy:
362-
type: approval
363-
requires:
364-
- ext_changelog_print
365-
- ext_do_release_groovy:
366-
filters:
367-
branches:
368-
only: main
369-
requires:
370-
- ext_release_groovy
371-
context:
372-
- SonatypeDeploy
373-
- ext_release_wtp:
374-
type: approval
375-
requires:
376-
- ext_changelog_print
377-
- ext_do_release_wtp:
378-
filters:
379-
branches:
380-
only: main
381-
requires:
382-
- ext_release_wtp
383-
context:
384-
- SonatypeDeploy

‎.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@ indent_size = 2
1616
# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
1717
ij_java_imports_layout = java.**,|,javax.**,|,org.**,|,com.**,|,com.diffplug.**,|,*
1818
ij_java_use_single_class_imports = true
19+
ij_java_class_count_to_use_import_on_demand = 999
20+
ij_java_names_count_to_use_import_on_demand = 999
21+
22+
[*.xml.mustache]
23+
indent_style = space

‎.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows/changelog-print.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: changelogPrint
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
name: changelogPrint
11+
steps:
12+
- uses: actions/checkout@v3
13+
- name: jdk 11
14+
uses: actions/setup-java@v3
15+
with:
16+
java-version: 11
17+
distribution: 'temurin'
18+
cache: 'gradle'
19+
- name: gradle caching
20+
uses: gradle/gradle-build-action@v2
21+
- run: ./gradlew changelogPrint

0 commit comments

Comments
 (0)