Merge pull request #7 from bow-swift/spm_project

Update dependencies and dark style
bow-swift · May 20, 2020 · 9287e7c · 9287e7c
2 parents 506646d + 7a8eef8
commit 9287e7c
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 913 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,3 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
 ## Build generated
 build/
 DerivedData
@@ -29,10 +25,10 @@ Carthage/
 *.ipa
 
 # Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
 .build/
+.swiftpm/
+*.xcodeproj/
+*.plist
 
 # CocoaPods
 #

diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/BowArch.xcodeproj/project.pbxproj b/BowArch.xcodeproj/project.pbxproj
diff --git a/BowArch.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/BowArch.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/BowArch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/BowArch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/BowArch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BowArch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/BowArch.xcodeproj/xcshareddata/xcschemes/BowArch.xcscheme b/BowArch.xcodeproj/xcshareddata/xcschemes/BowArch.xcscheme
diff --git a/BowArch.xcodeproj/xcuserdata/tomasruizlopez.xcuserdatad/xcschemes/xcschememanagement.plist b/BowArch.xcodeproj/xcuserdata/tomasruizlopez.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Package.resolved b/Package.resolved
@@ -4,55 +4,28 @@
       {
         "package": "Bow",
         "repositoryURL": "https://github.com/bow-swift/bow.git",
-        "state": {
-          "branch": "master",
-          "revision": "996a7a8816861f7ae6099e7400949b5d53645f64",
-          "version": null
-        }
-      },
-      {
-        "package": "Chalk",
-        "repositoryURL": "https://github.com/mxcl/Chalk.git",
-        "state": {
-          "branch": null,
-          "revision": "9aa9f348b86db3cf6702a3e43c081ecec80cf3c7",
-          "version": "0.4.0"
-        }
-      },
-      {
-        "package": "FileCheck",
-        "repositoryURL": "https://github.com/llvm-swift/FileCheck.git",
         "state": {
           "branch": null,
-          "revision": "9ed91cc30a1a325d989fac117f3f3065a16b9f76",
-          "version": "0.2.3"
+          "revision": "17ff76f1e0427a67e221c0a20b96324d256c340f",
+          "version": "0.8.0"
         }
       },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "c1bd31b397d87a54467af4161dde9d6b27720c19",
-          "version": "5.1.0"
-        }
-      },
-      {
-        "package": "swift-tools-support-core",
-        "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
-        "state": {
-          "branch": null,
-          "revision": "693aba4c4c9dcc4767cc853a0dd38bf90ad8c258",
-          "version": "0.0.1"
+          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
+          "version": "5.1.1"
         }
       },
       {
         "package": "SwiftCheck",
-        "repositoryURL": "https://github.com/typelift/SwiftCheck.git",
+        "repositoryURL": "https://github.com/bow-swift/SwiftCheck.git",
         "state": {
           "branch": null,
-          "revision": "077c096c3ddfc38db223ac8e525ad16ffb987138",
-          "version": "0.12.0"
+          "revision": "748359f9a95edf94d0c4664102f104f56b1ff1fb",
+          "version": "0.12.1"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 
 import PackageDescription
 
@@ -12,14 +12,17 @@ let package = Package(
     ],
 
     dependencies: [
-        .package(url: "https://github.com/bow-swift/bow.git", .branch("master")),
+        .package(name: "Bow", url: "https://github.com/bow-swift/bow.git", .exact("0.8.0")),
     ],
 
     targets: [
         // Library targets
-        .target(name: "BowArch", dependencies: ["Bow", "BowEffects", "BowOptics"]),
+        .target(name: "BowArch",
+                dependencies: [.product(name: "Bow", package: "Bow"),
+                               .product(name: "BowEffects", package: "Bow"),
+                               .product(name: "BowOptics", package: "Bow")]),
         // Test targets
         .testTarget(name: "BowArchTests",
-                    dependencies: ["BowArch"])
+                    dependencies: [.target(name: "BowArch")])
     ]
 )
diff --git a/Sources/BowArch/BowArch.h b/Sources/BowArch/BowArch.h
diff --git a/Sources/BowArch/Info.plist b/Sources/BowArch/Info.plist
diff --git a/Tests/BowArchTests/Info.plist b/Tests/BowArchTests/Info.plist
diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+arch.bow-swift.io
diff --git a/docs/_sass/components/_code.scss b/docs/_sass/components/_code.scss
@@ -8,7 +8,7 @@ code {
 p code,
 ul code {
   padding: 2px $base-point-grid;
-  background: $background-code;
+  background: $background-inline-code;
   font-family: $code-font-family;
   border-radius: 2px;
 }

diff --git a/docs/_sass/utils/_variables.scss b/docs/_sass/utils/_variables.scss
@@ -18,7 +18,8 @@ $link-hover: darken($gray-primary, 35%);
 $line-separator-color: #E3E5E8;
 $sidebar-active-color: rgba(29, 38, 63, 0.08);
 $sidebar-head-active-color: lighten($brand-secondary, 4%);
-$background-code: #f5f6f7;
+$background-code: #17213d;
+$background-inline-code: #f5f6f7;
 
 // Typography
 // -----------------------------------------------

diff --git a/docs/_sass/vendors/highlight/dracula.scss b/docs/_sass/vendors/highlight/dracula.scss
@@ -32,16 +32,17 @@
 // $dt-yellow: #f1fa8c;
 
 $dt-gray-dark: $background-code;  // Background
-$dt-gray: $brand-primary;       // Current Line & Selection
-$dt-gray-light: $brand-primary; // Foreground
-$dt-blue: #6272a4;       // Comment
-$dt-cyan: $brand-secondary;
-$dt-green: $brand-primary;
-$dt-orange: lighten($brand-secondary, 35);
-$dt-pink: lighten($brand-primary, 30);
-$dt-purple: darken($brand-secondary, 20);
-$dt-red: darken($brand-secondary, 20);
-$dt-yellow: $brand-primary;
+$dt-gray: #fff;       // Current Line & Selection
+$dt-gray-light: #fff; // Foreground
+$dt-blue: #6272a4;    // Comment
+$dt-cyan: $brand-secondary; // code
+
+$dt-green: #fff;
+$dt-orange: #fff;
+$dt-pink: lighten($brand-secondary, 20);
+$dt-purple: $brand-secondary;
+$dt-red: #fff;
+$dt-yellow: lighten($brand-secondary, 5);
 
 /*
  * Styles