Skip to content

Commit 57f6aa0

Browse files
[ci] Cleanup
1 parent 8803b49 commit 57f6aa0

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

download-jdk-sources.sh renamed to .circleci/download-jdk-sources.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DEST=$3
77
# that is normally distributed with JDK.
88
wget "$URL" -O full-src.zip
99
unzip -q full-src.zip
10-
cp -r "$QUALIFIER"u-*/src/java.base/share/classes java.base
11-
cp -r "$QUALIFIER"u-*/src/java.desktop/share/classes java.desktop
10+
cp -r jdk*/src/java.base/share/classes java.base
11+
cp -r jdk*/src/java.desktop/share/classes java.desktop
1212
zip -qr $DEST java.base java.desktop
13-
rm -rf java.base java.desktop "$QUALIFIER"u- full-src.zip
13+
rm -rf java.base java.desktop jdk* full-src.zip

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ base-src-jdk8.zip:
1717
touch $@
1818

1919
base-src-jdk11.zip:
20-
bash download-jdk-sources.sh https://github.com/adoptium/jdk11u/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
20+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk11u/archive/refs/tags/jdk-11.0.28+0.zip jdk11 $@
2121

2222
base-src-jdk17.zip:
23-
bash download-jdk-sources.sh https://github.com/adoptium/jdk17u/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
23+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk17u/archive/refs/tags/jdk-17.0.15+5.zip jdk17 $@
2424

2525
base-src-jdk21.zip:
26-
bash download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
26+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.7+5.zip jdk21 $@
2727

28-
base-src-jdk24.zip: # TODO: uses sources from jdk23 until jdk24 sources are out
29-
bash download-jdk-sources.sh https://github.com/adoptium/jdk23u/archive/refs/tags/jdk-23.0.1+11.zip jdk23 $@
28+
base-src-jdk24.zip:
29+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-24+36.zip jdk24 $@
3030

3131
copy-sources-to-jdk: base-src-$(JDK_SRC_VERSION).zip
3232
mkdir -p $(JAVA_HOME)/lib && cp base-src-$(JDK_SRC_VERSION).zip $(JAVA_HOME)/lib/src.zip

eastwood.clj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
(disable-warning
2-
{:linter :deprecations
3-
:symbol-matches #{#"^public boolean java\.lang\.reflect\.AccessibleObject\.isAccessible\(\)$"}
4-
:reason "The replacement, canAccess(Object), was added in JDK9 – but we still support JDK8."})
5-
61
(disable-warning
72
{:linter :deprecations
83
:symbol-matches #{#"^public final void java\.lang\.Thread\.stop\(\)$"}})

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@
137137
:eastwood [:test
138138
{:plugins [[jonase/eastwood "1.4.3"]]
139139
:eastwood {:config-files ["eastwood.clj"]
140-
:exclude-namespaces [cider.nrepl.middleware.test-filter-tests cider.tasks]}}]})
140+
:exclude-namespaces [cider.nrepl.middleware.test-filter-tests]}}]})

0 commit comments

Comments
 (0)