Skip to content

Commit 279e190

Browse files
committed
* bump to Clojure 1.10 as minimum dep
* bump clojure-maven-plugin and configure to exclude AOTed deps * change the assembly to exclude any dangling AOTed dep class files DOES NOT WORK, trying to use the resulting JAR leads to strange failures about the elided deftypes
1 parent 695afb8 commit 279e190

File tree

2 files changed

+6
-32
lines changed

2 files changed

+6
-32
lines changed

pom.template.xml

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.clojure</groupId>
2727
<artifactId>clojure</artifactId>
28-
<version>1.8.0</version>
28+
<version>1.10.0</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>com.google.javascript</groupId>
@@ -269,7 +269,7 @@
269269
<plugin>
270270
<groupId>com.theoryinpractise</groupId>
271271
<artifactId>clojure-maven-plugin</artifactId>
272-
<version>1.3.13</version>
272+
<version>1.8.3</version>
273273
<configuration>
274274
<temporaryOutputDirectory>false</temporaryOutputDirectory>
275275
</configuration>
@@ -281,34 +281,11 @@
281281
<goal>compile</goal>
282282
</goals>
283283
<configuration>
284-
<compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
284+
<cleanAOTNamespaces>true</cleanAOTNamespaces>
285285
<namespaces>
286-
<namespace>cljs.util</namespace>
287-
<namespace>cljs.env</namespace>
288-
<namespace>cljs.js-deps</namespace>
289-
<namespace>cljs.core</namespace>
290-
<namespace>cljs.source-map.base64</namespace>
291-
<namespace>cljs.source-map.base64-vlq</namespace>
292-
<namespace>cljs.source-map</namespace>
293-
<namespace>cljs.analyzer</namespace>
294-
<namespace>cljs.analyzer.utils</namespace>
295-
<namespace>cljs.compiler</namespace>
296-
<namespace>cljs.closure</namespace>
297-
<namespace>cljs.tagged-literals</namespace>
298-
<namespace>cljs.test</namespace>
299-
<namespace>cljs.analyzer.api</namespace>
300-
<namespace>cljs.build.api</namespace>
301-
<namespace>cljs.compiler.api</namespace>
302-
<namespace>cljs.spec.alpha</namespace>
303-
<namespace>cljs.spec.test.alpha</namespace>
304-
<namespace>cljs.spec.gen.alpha</namespace>
305-
<namespace>cljs.repl</namespace>
306-
<namespace>cljs.repl.browser</namespace>
307-
<namespace>cljs.repl.node</namespace>
308-
<namespace>cljs.repl.reflect</namespace>
309-
<namespace>cljs.repl.server</namespace>
310-
<namespace>cljs.main</namespace>
311-
<namespace>cljs.cli</namespace>
286+
<namespace>!clojure.tools.reader.*</namespace>
287+
<namespace>!clojure.data.json.*</namespace>
288+
<namespace>!cognitect.transit.*</namespace>
312289
</namespaces>
313290
</configuration>
314291
</execution>

src/assembly/aot.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
88
<fileSet>
99
<directory>target/classes</directory>
1010
<outputDirectory>/</outputDirectory>
11-
<!-- Excluding these breaks AOT, needs more investigating -->
12-
<!--
1311
<excludes>
1412
<exclude>clojure/data/**</exclude>
1513
<exclude>clojure/tools/**</exclude>
1614
<exclude>cognitect/**</exclude>
1715
</excludes>
18-
-->
1916
</fileSet>
2017
</fileSets>
2118
<files>

0 commit comments

Comments
 (0)