Feature/clojure 1.9a17 (#109)

* update ns decls for spec.alpha

* bump pluginsto latest

project.clj

@@ -14,11 +14,11 @@
   :plugins [[org.clojure/tools.cli "0.3.3" :exclusions [org.clojure/clojure]]
             [lein-ancient "0.6.10"]
             [com.livingsocial/lein-dependency-check "0.2.2"]
-            [lein-kibit "0.1.2" :exclusions [org.clojure/clojure
+            [lein-kibit "0.1.5" :exclusions [org.clojure/clojure
                                              org.clojure/tools.cli]]
-            [jonase/eastwood "0.2.3"]
-            [lein-bikeshed "0.3.0"]
-            [lein-cloverage "1.0.6"]
+            [jonase/eastwood "0.2.4"]
+            [lein-bikeshed "0.4.1"]
+            [lein-cloverage "1.0.9"]
             [lein-codox "0.9.6"]]
   :repositories [["snapshots" {:url "https://clojars.org/repo"
                                :username :env/clojars_username
@@ -47,6 +47,6 @@
                                :unused-private-vars]
              :exclude-linters [:suspicious-expression]}
   :profiles {:uberjar {:aot :all}
-             :provided {:dependencies [[org.clojure/clojure "1.9.0-alpha13"]]}
+             :provided {:dependencies [[org.clojure/clojure "1.9.0-alpha17"]]}
              :dev {:resource-paths ["test-resources"]
                    :dependencies [[org.clojure/test.check "0.9.0"]]}})

src/crucible/assertion.clj

@@ -4,7 +4,7 @@
 
 (def resource= 'encoded-as)
 
-;; clojure.test doesn't print ex-data which is a pain with clojure.spec
+;; clojure.test doesn't print ex-data which is a pain with clojure.spec.alpha
 ;; remove when ex-data is printed on test failures by default...
 (defmethod test/assert-expr 'encoded-as [msg form]
   (let [expected (nth form 1)

src/crucible/aws/api_gateway.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.api-gateway
   "Resources in AWS::ApiGateway::*"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.encoding.keys :refer [->key]]))
 

src/crucible/aws/cloudformation.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.cloudformation
   "Resources in AWS::CloudFormation::*"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.encoding.keys :refer [->key]]))
 

src/crucible/aws/cloudwatch.clj

@@ -3,7 +3,7 @@
   (:require [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.values :as v]
             [crucible.encoding.keys :refer [->key]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (defmethod ->key ::ok-actions [_] "OKActions")
 

src/crucible/aws/custom_resource.clj

@@ -4,7 +4,7 @@
   when using the resource."
   (:require [crucible.resources :refer [spec-or-ref resource-factory]]
             [crucible.encoding.keys :refer [->key]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::service-token (spec-or-ref string?))
 

src/crucible/aws/dynamodb.clj

@@ -1,7 +1,7 @@
 (ns crucible.aws.dynamodb
   "Resources in AWS::DynamoDB::*"
   (:require [crucible.resources :refer [spec-or-ref defresource]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::table-name (spec-or-ref string?))
 

src/crucible/aws/ec2.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.ec2
   "Resources in AWS::EC2::*"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource] :as res]))
 
 (defn ec2 [suffix] (str "AWS::EC2::" suffix))

src/crucible/aws/events.clj

@@ -3,7 +3,7 @@
   (:require [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.values :as v]
             [crucible.encoding.keys :refer [->key]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::id (spec-or-ref #(re-matches #"[\.\-_A-Za-z0-9]+" %)))
 

src/crucible/aws/firehose.clj

@@ -1,7 +1,7 @@
 (ns crucible.aws.firehose
   "Resources in AWS::KinesisFirehose::DeliveryStream"
   (:require [crucible.resources :refer [spec-or-ref defresource] :as res]
-            [clojure.spec :as s]
+            [clojure.spec.alpha :as s]
             [crucible.encoding.keys :refer [->key]]))
 
 (defmethod ->key :size-in-mbs [_]

src/crucible/aws/iam.clj

@@ -2,7 +2,7 @@
   "Resources in AWS::IAM::*"
   (:require [crucible.resources :refer [resource-factory spec-or-ref defresource]]
             [crucible.encoding.keys :refer [->key]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::assume-role-policy-document any?)
 

src/crucible/aws/kinesis.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.kinesis
   "Resources in AWS::Kinesis::*"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource]]))
 
 (s/def ::shard-count (spec-or-ref pos-int?))

src/crucible/aws/lambda.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.lambda
   (:require [crucible.resources :refer [spec-or-ref defresource]]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::subnet-id (s/* (spec-or-ref string?)))
 

src/crucible/aws/rds.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.rds
   "Resources in AWS::RDS::*"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.encoding.keys :refer [->key]]
             [crucible.aws.rds.db-instance :as dbi]))

src/crucible/aws/rds/db_instance.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.rds.db-instance
   "Resources in AWS::RDS::DBInstance"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.encoding.keys :refer [->key]]))
 

src/crucible/aws/s3.clj

@@ -2,7 +2,7 @@
   "Resources in AWS::S3::*"
   (:require [crucible.resources :refer [spec-or-ref defresource] :as res]
             [crucible.aws.iam :as iam]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::arn string?)
 

src/crucible/aws/sns.clj

@@ -2,7 +2,7 @@
   "Resources in AWS::SNS::*"
   (:require [crucible.resources :refer [spec-or-ref defresource]]
             [crucible.aws.iam :as iam]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (s/def ::display-name (spec-or-ref string?))
 

src/crucible/core.clj

@@ -1,6 +1,6 @@
 (ns crucible.core
   "Commonly used template construction functions"
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [clojure.walk :as walk]
             [crucible.values :as v]
             [crucible.parameters :as p]

src/crucible/encoding/main.clj

@@ -7,8 +7,8 @@
             [clojure.tools.namespace.repl :as ns-repl]
             [clojure.tools.cli :refer [parse-opts]]
             [clojure.java.io :as io]
-            [clojure.spec :as s]
-            [clojure.spec.test :as stest]))
+            [clojure.spec.alpha :as s]
+            [clojure.spec.test.alpha :as stest]))
 
 (defn template-var->write-location [tvar]
   (let [template-ns (ns-name (:ns (meta tvar)))

src/crucible/mappings.clj

@@ -1,5 +1,5 @@
 (ns crucible.mappings
-  (:require [clojure.spec :as s]))
+  (:require [clojure.spec.alpha :as s]))
 
 (s/def ::mapping
   (s/map-of string?

src/crucible/outputs.clj

@@ -1,5 +1,5 @@
 (ns crucible.outputs
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.values :as v]))
 
 (s/def ::name ::v/value)

src/crucible/parameters.clj

@@ -1,5 +1,5 @@
 (ns crucible.parameters
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.encoding.keys :as keys]))
 
 (defmethod keys/->key :list-number [_] "List<Number>")

src/crucible/policies.clj

@@ -1,5 +1,5 @@
 (ns crucible.policies
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.encoding.keys :refer [->key]]))
 
 (s/def ::deletion-policy #{::retain ::delete ::snapshot})

src/crucible/resources.clj

@@ -1,5 +1,5 @@
 (ns crucible.resources
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.policies :as policies]))
 
 (s/def ::props-type keyword?)

src/crucible/values.clj

@@ -1,5 +1,5 @@
 (ns crucible.values
-  (:require [clojure.spec :as s]
+  (:require [clojure.spec.alpha :as s]
             [crucible.resources :refer [spec-or-ref]]
             [crucible.encoding.keys :as keys]))
 

test/crucible/aws/ec2_test.clj

@@ -3,7 +3,7 @@
              [crucible.aws.ec2 :as ec2]
              [crucible.resources :as res]
              [cheshire.core :as json]
-             [clojure.spec :as s]
+             [clojure.spec.alpha :as s]
              [crucible.core :refer [template encode parameter xref]]))
 
 (deftest vpc-test

test/crucible/aws/iam_test.clj

@@ -1,6 +1,6 @@
 (ns crucible.aws.iam-test
   (:require [crucible.aws.iam :as iam]
-            [clojure.spec :as s]
+            [clojure.spec.alpha :as s]
             [clojure.test :refer :all]))
 
 (defn valid [spec candidate]

test/crucible/aws/lambda_test.clj

@@ -3,7 +3,7 @@
              [crucible.aws.lambda :as l]
              [crucible.resources :as res]
              [cheshire.core :as json]
-             [clojure.spec :as s]
+             [clojure.spec.alpha :as s]
              [crucible.core :refer [xref account-id parameter]]
              [crucible.assertion :refer [resource=]]))
 

test/crucible/encoding/keys_test.clj

@@ -3,7 +3,7 @@
             [crucible.core :as cru]
             [crucible.resources :as r]
             [clojure.test :refer :all]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (def testing-123-translation "Testing123Foo")
 

test/crucible/parameters_test.clj

@@ -3,7 +3,7 @@
             [crucible.parameters :as p]
             [crucible.encoding :as enc]
             [clojure.test :refer :all]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (deftest parameters-test
   (testing "comma delimited list"

test/crucible/resources_test.clj

@@ -2,7 +2,7 @@
   (:require [crucible.resources :as res]
             [crucible.values :as v]
             [clojure.test :refer :all]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (deftest resource-property-type
   (testing "single ref is valid"

test/crucible/values_test.clj

@@ -3,7 +3,7 @@
              [core :as cru]
              [values :as v]]
             [clojure.test :refer :all]
-            [clojure.spec :as s]))
+            [clojure.spec.alpha :as s]))
 
 (deftest join-test
   (testing "no values" (is (s/valid? ::v/value (cru/join "-" []))))

test/crucible/xref_test.clj

@@ -1,7 +1,7 @@
 (ns crucible.xref-test
   (:require  [clojure.test :refer :all]
              [crucible.values :as v]
-             [clojure.spec :as s]))
+             [clojure.spec.alpha :as s]))
 
 (deftest valid-xref
   (testing "plain xref validates"