Merge branch 'feature/public-travis-ci'

carousell · Jul 1, 2017 · bc84776 · bc84776
2 parents 7d59aa0 + 967e897
commit bc84776
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 427 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+3.1
diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,11 @@ install:
   - bundle install --jobs=3 --retry=3 --deployment
   - bundle exec pod install --project-directory=Example
 script:
-  - make -B build
+  - make -B test
   - make -B carthage
+  - make -B docs
   - bundle exec danger
 notifications:
+  email: false
   slack:
-    secure: XOSLv6bKx785kgGSNPMyIErZ1jNVfjDFNIOK0xF/ZszCRCRuB7LkfoorApjariTzZGC+EpdLeXgDZRKE/inVXwJVJ18WiSfHmT98198obq/GOlo8rsyzaPt6HU4wPP/utIBUufJVwGkKUPPxeM2PXUfmp0plAjbv6i0w/WhZ/qavIQSV7Gg9xIC8z6dwCcTDFNFZ5cfMBgV/8Q5ifCsC13WjohwiiBLXQHh4nQDgGGHJzSc2r4U6/C0wrMRLS5jqS0xT4Rr/umOQ7R2Cq1ASj/H84e+lsfyxfoC28XVj+zqjJL5AqWDuLrfELwhW3+ZViy99hIBD53MdvQEI7kj4qICqmKYuHZ9AJz1pAIKOqOVXtTrbnyyqdnpBOmn6ZNHGqX7rIz6FxIVasDADU20IeGKIrQDgQVxWI8QQroOr0FNY5fhz/MTelLyhatAQFL+Ht0I6laIZIsH+sl+071sEy63/evLflNkj+2pGYRoEw0dmB1l/Qs1SfmqyrouXhXz1PytK7Arm7sZ06ZTgifeKSw8brl7pl25q5fHSoPRAOtxfynMpmwa/dpc4CDxQRiPz0O4BJW8zsAz5VYLNTWsp0ywvLhh6jVp1x/6+BOl+TZW/9WVTPRrYZg+0OJlajUssxhkx4S9zBxz9bm1kgfyw4ltqy/+FVWWJSwWi6I4q174=
+    secure: MJGlCCPZrGNkehqNxphGwKQ3eBXSzX5le94xXIsmBNejdezoOMa/c8SiNJjZk+zYgIpriKSaH5GizhYspqFZlpcdIWyRp7l5K0hdnVVgLGfdumm4DtHaK9SkhUi7Zhfs1BZamEzeH4IZ/vJ/no75BsPa2DUu0lYVZLjKSo73Cvi4OngeOxeg7WHAUDyUZExw4SAaVJHEJuQUi+kQMIO940+7m2AEWYWb2rq+Ep0KBd6V3xskt6hK6uT5jeU9CeoowD5KNqAP8fJEm3KpG3KnjwROhSfWuESVURei0uUNKxlpGGIUQD0xIYM2RtuX46VbmstXsuzWLlm8kpRLknoshYbU8DQEFsBr09yvG6Xa3A4S5103As/dFLZ0y+UIdbzT3NeZt/0VgwkBNIvKJTwQgy8Zx+uxVXuUWVIY+4KETIbi8HOAyFLAJjP8Kg/yIrt/J486+m79DSP3wfDgv4HBgiByxtA7ciCxnvEJhDFVsd481Bw7sCCnhAigH3R/oeOCDtWwYYsOynK94sCjtl3dhYf3IanhQz+Ix8Z7z86j60fslZrd0/44WtaZGqDFI6mVC0HNhCLBJ+TZfKxJ+R23hL+iIoiV7KCpAtvPwV/aDfOvluWpoKOgfKd/OW3DJVTtVZcfOmivUTCbMW+9eTjYRbJEFpiVfkpaIYW2JcgIJxY=
diff --git a/Example/Pickle.xcodeproj/project.pbxproj b/Example/Pickle.xcodeproj/project.pbxproj
diff --git a/Example/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle-Example.xcscheme b/Example/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle-Example.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-               BuildableName = "Pickle_Example.app"
-               BlueprintName = "Pickle_Example"
+               BuildableName = "PickleExample.app"
+               BlueprintName = "PickleExample"
                ReferencedContainer = "container:Pickle.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,9 +46,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "Pickle_Tests.xctest"
-               BlueprintName = "Pickle_Tests"
+               BlueprintIdentifier = "B563515A1F06278E00B5A46D"
+               BuildableName = "PickleUITests.xctest"
+               BlueprintName = "PickleUITests"
                ReferencedContainer = "container:Pickle.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -57,8 +57,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Pickle_Example.app"
-            BlueprintName = "Pickle_Example"
+            BuildableName = "PickleExample.app"
+            BlueprintName = "PickleExample"
             ReferencedContainer = "container:Pickle.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,8 +80,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Pickle_Example.app"
-            BlueprintName = "Pickle_Example"
+            BuildableName = "PickleExample.app"
+            BlueprintName = "PickleExample"
             ReferencedContainer = "container:Pickle.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -99,8 +99,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Pickle_Example.app"
-            BlueprintName = "Pickle_Example"
+            BuildableName = "PickleExample.app"
+            BlueprintName = "PickleExample"
             ReferencedContainer = "container:Pickle.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

diff --git a/Example/Podfile b/Example/Podfile
@@ -1,11 +1,11 @@
 platform :ios, '8.0'
 use_frameworks!
 
-target 'Pickle_Example' do
+target 'PickleExample' do
   pod 'Pickle', :path => '../'
   pod 'SwiftLint'
 
-  target 'Pickle_Tests' do
+  target 'PickleUITests' do
     inherit! :search_paths
   end
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -14,6 +14,6 @@ SPEC CHECKSUMS:
   Pickle: c9b9e1ddd4c9baaef4d3561ecbe99d71de35fbb6
   SwiftLint: b467d08f5b25dc3b3cfed243d8e1b74b91714c67
 
-PODFILE CHECKSUM: e3dab263dce353d920bcff7665a1d53318268487
+PODFILE CHECKSUM: deb6efd06d1eb162719911e286f38d05b1590fdb
 
 COCOAPODS: 1.2.1