feat: Upgrade ClojureDart to `8d5916c0dc87146dc2e8921aaa7fd5dc3c6c340…

…1` to support Dart 3 and Flutter 3.10.0
ampersanda · May 12, 2023 · 4b37547 · 4b37547
1 parent d35e34e
commit 4b37547
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.3.0
+- Upgrade ClojureDart to `8d5916c0dc87146dc2e8921aaa7fd5dc3c6c3401` to support Dart 3 and Flutter 3.10.0
+
 ## 1.2.2
 - Upgrade ClojureDart to `81dd5f73285b06fa8904076e3299ee8feff101df`
 - Update example to use `f/run` instead of `m/runApp` to activate hot reload for project starter

diff --git a/cljds.iml b/cljds.iml
@@ -9,21 +9,21 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/6304986ec5bb2aabe2d498522b62fbcf5494d7dc/cljd_helper/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/6304986ec5bb2aabe2d498522b62fbcf5494d7dc/cljd_helper/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/6304986ec5bb2aabe2d498522b62fbcf5494d7dc/cljd_helper/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/81dd5f73285b06fa8904076e3299ee8feff101df/cljd_helper/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/81dd5f73285b06fa8904076e3299ee8feff101df/cljd_helper/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/81dd5f73285b06fa8904076e3299ee8feff101df/cljd_helper/build" />
       <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/84b18f8e67556862f265ea41f3a9e5f9506cdbef/cljd_helper/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/84b18f8e67556862f265ea41f3a9e5f9506cdbef/cljd_helper/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/.clojuredart/cache/84b18f8e67556862f265ea41f3a9e5f9506cdbef/cljd_helper/build" />
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/hello_world/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/example/hello_world/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/example/hello_world/build" />
       <excludeFolder url="file://$MODULE_DIR$/example/quickstart/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/example/quickstart/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/quickstart/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/quickstart_flutter/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/example/quickstart_flutter/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/example/quickstart_flutter/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -82,7 +82,7 @@
     <orderEntry type="library" name="Deps: org.eclipse.jetty/jetty-client:9.4.44.v20210927" level="project" />
     <orderEntry type="library" name="Deps: org.eclipse.jetty/jetty-io:9.4.44.v20210927" level="project" />
     <orderEntry type="library" name="Deps: org.clojure/tools.reader:1.3.6" level="project" />
-    <orderEntry type="library" name="Deps: tensegritics/clojuredart:84b18f" level="project" />
+    <orderEntry type="library" name="Deps: tensegritics/clojuredart:630498" level="project" />
     <orderEntry type="library" name="Deps: org.clojure/tools.gitlibs:2.4.172" level="project" />
     <orderEntry type="library" name="Deps: org.apache.maven.resolver/maven-resolver-connector-basic:1.6.3" level="project" />
     <orderEntry type="library" name="Deps: com.cognitect.aws/s3:814.2.1053.0" level="project" />
@@ -102,7 +102,5 @@
     <orderEntry type="library" name="Deps: org.clojure/core.async:1.5.644" level="project" />
     <orderEntry type="library" name="Deps: org.apache.maven/maven-artifact:3.8.4" level="project" />
     <orderEntry type="library" name="Deps: org.clojure/data.codec:0.1.0" level="project" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>
diff --git a/deps.edn b/deps.edn
@@ -3,7 +3,7 @@
              tensegritics/clojuredart
              {:git/url "[email protected]:tensegritics/ClojureDart.git"
               ; or  "https://github.com/tensegritics/ClojureDart.git"
-              :sha     "81dd5f73285b06fa8904076e3299ee8feff101df" #_"84b18f8e67556862f265ea41f3a9e5f9506cdbef"}}
+              :sha     "8d5916c0dc87146dc2e8921aaa7fd5dc3c6c3401"}}
  :aliases   {:cljd {:main-opts ["-m" "cljd.build"]}}
  :cljd/opts {:kind :dart
              :main cljds.core}}
diff --git a/example/try-dart.sh b/example/try-dart.sh
@@ -8,3 +8,7 @@ clj -M:cljd compile
 cd example || exit
 
 dart run ../bin/cljds.dart dart quickstart
+
+cd quickstart || exit
+
+clj -M:cljd compile && dart run bin/quickstart.dart