Cleanup (#819)

* Remove unused imports

* Remove duplicate requires

Author: djblue

src/main/shadow/build/api.clj

@@ -15,10 +15,8 @@
             [shadow.build.resource :as rc]
             [shadow.jvm-log :as log]
             [clojure.set :as set]
-            [shadow.build.resolve :as resolve]
             [shadow.build.babel :as babel])
-  (:import (java.io File)
-           (java.util.concurrent ExecutorService)))
+  (:import (java.util.concurrent ExecutorService)))
 
 (defn build-state? [build]
   (data/build-state? build))

src/main/shadow/build/classpath.clj

@@ -19,7 +19,7 @@
     [shadow.build.cljs-bridge :as cljs-bridge]
     [shadow.build.npm :as npm]
     [shadow.build.data :as data])
-  (:import (java.io File StringReader)
+  (:import (java.io File)
            (java.util.jar JarFile JarEntry Attributes$Name)
            (java.net URL URLDecoder)
            (java.util.zip ZipException)
@@ -28,7 +28,7 @@
            [com.google.javascript.jscomp CompilerOptions$LanguageMode CompilerOptions SourceFile]
            [com.google.javascript.jscomp.deps ModuleNames]
            [javax.xml.parsers DocumentBuilderFactory]
-           [org.w3c.dom Node Element]))
+           [org.w3c.dom Element]))
 
 (set! *warn-on-reflection* true)
 

src/main/shadow/build/cljs_bridge.clj

@@ -16,8 +16,7 @@
     [shadow.build.ns-form :as ns-form]
     [shadow.build.cljs-hacks]
     [shadow.build.data :as data])
-  (:import (java.io PushbackReader StringReader)
-           (java.util.concurrent Executors ExecutorService)))
+  (:import (java.io PushbackReader StringReader)))
 
 
 (defn get-resource-info [resource-name content reader-features]

src/main/shadow/build/closure.clj

@@ -6,7 +6,6 @@
     [cljs.analyzer :as ana]
     [cljs.compiler :as comp]
     [cljs.env :as env]
-    [cljs.compiler :as cljs-comp]
     [shadow.cljs.util :as util]
     [shadow.build.output :as output]
     [shadow.build.warnings :as warnings]
@@ -17,15 +16,14 @@
     [shadow.core-ext :as core-ext]
     [shadow.build.resource :as rc]
     [shadow.debug :refer (?> ?-> ?->>)]
-    [clojure.data.json :as json]
-    [shadow.debug :as dbg])
-  (:import (java.io StringWriter ByteArrayInputStream FileOutputStream File StringReader)
+    [clojure.data.json :as json])
+  (:import (java.io StringWriter ByteArrayInputStream FileOutputStream)
            (com.google.javascript.jscomp JSError SourceFile CompilerOptions CustomPassExecutionTime
                                          CommandLineRunner VariableMap SourceMapInput DiagnosticGroups
                                          CheckLevel JSModule CompilerOptions$LanguageMode
                                          Result ShadowAccess
-                                         SourceMap$DetailLevel SourceMap$Format ClosureCodingConvention CompilationLevel AnonymousFunctionNamingPolicy DiagnosticGroup NodeTraversal StrictModeCheck VariableRenamingPolicy PropertyRenamingPolicy PhaseOptimizer)
-           (shadow.build.closure ReplaceCLJSConstants NodeEnvInlinePass ReplaceRequirePass PropertyCollector NodeStuffInlinePass FindSurvivingRequireCalls ClearUnassignedJsRequires)
+                                         SourceMap$DetailLevel SourceMap$Format ClosureCodingConvention CompilationLevel AnonymousFunctionNamingPolicy DiagnosticGroup VariableRenamingPolicy PropertyRenamingPolicy PhaseOptimizer)
+           (shadow.build.closure ReplaceCLJSConstants NodeEnvInlinePass ReplaceRequirePass PropertyCollector NodeStuffInlinePass FindSurvivingRequireCalls)
            (com.google.javascript.jscomp.deps ModuleLoader$ResolutionMode)
            (java.nio.charset Charset)
            [java.util.logging Logger Level]
@@ -329,14 +327,14 @@
 
         content
         (str (->> file-globals
-                  (map #(cljs-comp/munge % #{}))
+                  (map #(comp/munge % #{}))
                   (sort)
                   (map #(str "/** @const {ShadowJS} */ var " % ";"))
                   (str/join "\n"))
              "\n"
              (->> file-props
                   (sort)
-                  (map #(cljs-comp/munge % #{}))
+                  (map #(comp/munge % #{}))
                   (map #(str "ShadowJS.prototype." % ";"))
                   (str/join "\n")))]
 
@@ -360,14 +358,14 @@
         content
         (str (->> js-globals
                   (remove known-js-globals)
-                  (map #(cljs-comp/munge % #{}))
+                  (map #(comp/munge % #{}))
                   (sort)
                   (map #(str "/** @const {ShadowJS} */ var " % ";"))
                   (str/join "\n"))
              "\n"
              (->> js-props
                   (sort)
-                  (map #(cljs-comp/munge % #{}))
+                  (map #(comp/munge % #{}))
                   (map #(str "ShadowJS.prototype." % ";"))
                   (str/join "\n")))]
 
@@ -1302,7 +1300,7 @@
                   (if (and (:import require-loc) (or (= :goog type) (= :shadow-js type)))
                     ;; goog supports import ... from "goog:cljs.core" in ES6 files
                     ;; but not for commonjs require
-                    (str "goog:" (cljs-comp/munge ns))
+                    (str "goog:" (comp/munge ns))
                     (str "/" resource-name))]
 
               (str (subs source 0 (inc offset))
@@ -1419,7 +1417,7 @@
                       (case type
                         ;; just in case we add the goog.provide for cljs/closure namespaces
                         (:cljs :goog :shadow-js)
-                        (str "goog.provide(\"" (cljs-comp/munge ns) "\");")
+                        (str "goog.provide(\"" (comp/munge ns) "\");")
                         (throw (ex-info (format "whats this? %s type: %s" resource-name type) {}))))))
              (into []))
 

src/main/shadow/build/compiler.clj

@@ -5,7 +5,6 @@
     [clojure.java.io :as io]
     [clojure.tools.reader.reader-types :as readers]
     [clojure.tools.reader :as reader]
-    [cljs.analyzer :as cljs-ana]
     [cljs.analyzer :as ana]
     [cljs.compiler :as comp]
     [cljs.spec.alpha :as cljs-spec]
@@ -27,8 +26,7 @@
     [shadow.build.closure :as closure]
     [shadow.build.npm :as npm]
     [shadow.jvm-log :as log]
-    [shadow.build.async :as async]
-    [shadow.debug :as dbg])
+    [shadow.build.async :as async])
   (:import (java.util.concurrent ExecutorService)
            (java.io File StringReader PushbackReader StringWriter)
            [java.util.concurrent.atomic AtomicLong]))
@@ -139,7 +137,7 @@
               pprefix (protocol-prefix protocol)]
 
           ;; assoc into ns so cache can restore it
-          (swap! env/*compiler* update-in [::cljs-ana/namespaces protocol-ns :shadow/protocol-prefixes] util/set-conj pprefix)
+          (swap! env/*compiler* update-in [::ana/namespaces protocol-ns :shadow/protocol-prefixes] util/set-conj pprefix)
           ;; used by externs inference since it otherwise can't identify protocol properties
           (swap! env/*compiler* update :shadow/protocol-prefixes util/set-conj pprefix)
           ))))
@@ -156,7 +154,7 @@
         (let [require (second form)
               ns (-> env :ns :name)]
           (when (string? require)
-            (swap! env/*compiler* update-in [::cljs-ana/namespaces ns :shadow/js-requires] util/set-conj require)
+            (swap! env/*compiler* update-in [::ana/namespaces ns :shadow/js-requires] util/set-conj require)
             )))))
   ast)
 
@@ -1027,7 +1025,7 @@
 (defn load-core []
   ;; cljs.core is already required and loaded when this is called
   ;; this just interns the macros into the analyzer env
-  (cljs-ana/intern-macros 'cljs.core))
+  (ana/intern-macros 'cljs.core))
 
 (defn par-compile-cljs-sources
   "compile files in parallel, files MUST be in dependency order and ALL dependencies must be present

src/main/shadow/build/ns_form.clj

@@ -5,8 +5,7 @@
             [clojure.string :as str]
             [cljs.compiler :as cljs-comp]
             [shadow.cljs.util :as util :refer (reduce-> reduce-kv->)]
-            [shadow.build.data :as data])
-  (:import (java.nio.file Paths FileSystems)))
+            [shadow.build.data :as data]))
 
 ;; [clojure.core.specs.alpha :as cs]
 ;; too many differences in CLJS ns to make use of those

src/main/shadow/build/resolve.clj

@@ -5,7 +5,6 @@
     [shadow.cljs.util :as util]
     [shadow.build.classpath :as cp]
     [shadow.build.npm :as npm]
-    [shadow.build.classpath :as classpath]
     [shadow.build.data :as data]
     [shadow.build.js-support :as js-support]
     [shadow.build.cljs-bridge :as cljs-bridge]
@@ -626,7 +625,7 @@
                               (map #(symbol (str ns %))))))
                (filter (fn [spec-ns]
                          (or (get-in state [:sym->id spec-ns])
-                             (classpath/has-resource? classpath spec-ns))))
+                             (cp/has-resource? classpath spec-ns))))
                (vec)))]
 
     (if-not (seq auto-require-namespaces)

src/main/shadow/build/targets/browser.clj

@@ -16,7 +16,6 @@
             [shadow.build.closure :as closure]
             [shadow.build.modules :as modules]
             [shadow.build.data :as data]
-            [shadow.build.log :as log]
             [shadow.core-ext :as core-ext]
             [cljs.compiler :as cljs-comp]
             [shadow.build.npm :as npm]

src/main/shadow/build/targets/shared.clj

@@ -7,8 +7,7 @@
             [shadow.build.api :as cljs]
             [shadow.build.data :as data]
             [shadow.build.modules :as modules]
-            [clojure.data.json :as json])
-  (:import [java.net InetAddress]))
+            [clojure.data.json :as json]))
 
 (defn unquoted-qualified-symbol? [sym]
   (and (qualified-symbol? sym)

src/main/shadow/build/targets/single_file.clj

@@ -12,8 +12,7 @@
     [shadow.build.data :as data]
     [clojure.data.json :as json]
     [clojure.string :as str]
-    [shadow.cljs.util :as util])
-  (:import [java.io StringReader]))
+    [shadow.cljs.util :as util]))
 
 (defn configure
   [{:keys [worker-info] :as state} mode {:keys [build-id output-to entry] :as config}]