Browse Source

Rename the XCode folder to Xcode

Victor Sigler 5 years ago
parent
commit
e1e4f12780
7 changed files with 13 additions and 13 deletions
  1. 4 4
      .github/workflows/macos-tests.yml
  2. 1 1
      .gitignore
  3. 1 1
      .swiftlint.yml
  4. 3 3
      Dangerfile
  5. 2 2
      Package.swift
  6. 1 1
      README.md
  7. 1 1
      Swifter.podspec

+ 4 - 4
.github/workflows/macos-tests.yml

@@ -21,19 +21,19 @@ jobs:
             mkdir -p tmp/test-results/
       - name: Run Unit Test - macOS
         run: |
-            cd XCode
+            cd Xcode
             set -o pipefail && xcodebuild test -scheme SwifterMac -sdk macosx -destination "arch=x86_64" | xcpretty -c -r html --output $TEST_REPORTS/macOS.html
       - name: Run Unit Test - iOS
         run: |
-            cd XCode
+            cd Xcode
             set -o pipefail && xcodebuild test -scheme SwifteriOS -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty -c -r html --output $TEST_REPORTS/iOS.html
       - name: Run Unit Test - tvOS
         run: |
-            cd XCode
+            cd Xcode
             set -o pipefail && xcodebuild test -scheme SwiftertvOS -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c -r html --output $TEST_REPORTS/tvOS.html
       - name: Run Unit Test - Swift Package Manager
         run: |
-            cd XCode
+            cd Xcode
             swift build && swift test
       - name: Archive Test results
         uses: actions/upload-artifact@v1

+ 1 - 1
.gitignore

@@ -27,4 +27,4 @@ DerivedData
 
 .build/
 Packages/
-/XCode/.DS_Store
+/Xcode/.DS_Store

+ 1 - 1
.swiftlint.yml

@@ -16,6 +16,6 @@ disabled_rules:
 
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - LinuxMain.swift
-  - XCode/Tests/XCTestManifests.swift
+  - Xcode/Tests/XCTestManifests.swift
   - Tests/XCTestManifests.swift
   - Package.swift

+ 3 - 3
Dangerfile

@@ -26,10 +26,10 @@ swiftlint.config_file = '.swiftlint.yml'
 swiftlint.lint_files
 
 # Warn when new tests are added but the XCTestManifests wasn't updated to run on Linux
-tests_added_or_modified = !git.modified_files.grep(/XCode\/Tests/).empty? || !git.added_files.grep(/XCode\/Tests/).empty?
-xc_manifest_updated = !git.modified_files.grep(/XCode\/Tests\/XCTestManifests.swift/).empty?
+tests_added_or_modified = !git.modified_files.grep(/Xcode\/Tests/).empty? || !git.added_files.grep(/Xcode\/Tests/).empty?
+xc_manifest_updated = !git.modified_files.grep(/Xcode\/Tests\/XCTestManifests.swift/).empty?
 if tests_added_or_modified && !xc_manifest_updated
-  warn("It seems like you've added new tests to the library. If that's the case, please update the [XCTestManifests.swift](https://github.com/httpswift/swifter/blob/stable/XCode/Tests/XCTestManifests.swift) file running in your terminal the command `swift test --generate-linuxmain`.")
+  warn("It seems like you've added new tests to the library. If that's the case, please update the [XCTestManifests.swift](https://github.com/httpswift/swifter/blob/stable/Xcode/Tests/XCTestManifests.swift) file running in your terminal the command `swift test --generate-linuxmain`.")
 
   # This is a temporary warning to remove the entry for the failed test until we solve the issue in Linux
   warn("If you ran the command `swift test --generate-linuxmain` in your terminal, please remove the line `testCase(IOSafetyTests.__allTests__IOSafetyTests),` from `public func __allTests() -> [XCTestCaseEntry]` in the bottom of the file. For more reference see [#366](https://github.com/httpswift/swifter/issues/366).")

+ 2 - 2
Package.swift

@@ -16,7 +16,7 @@ let package = Package(
     .target(
       name: "Swifter", 
       dependencies: [], 
-      path: "XCode/Sources"
+      path: "Xcode/Sources"
       ),
 
     .target(
@@ -31,7 +31,7 @@ let package = Package(
       dependencies: [
         "Swifter"
       ], 
-      path: "XCode/Tests"
+      path: "Xcode/Tests"
     )
   ]
 )

+ 1 - 1
README.md

@@ -9,7 +9,7 @@
 Tiny http server engine written in [Swift](https://developer.apple.com/swift/) programming language.
 
 ### Branches
-`* stable` - lands on CocoaPods and others. Supports the latest non-beta XCode and SPM. Stable.
+`* stable` - lands on CocoaPods and others. Supports the latest non-beta Xcode and SPM. Stable.
 
 `* master` - stable branch plus experimental web-framework layer.
 

+ 1 - 1
Swifter.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.10"
   s.tvos.deployment_target = "9.0"
   s.source                = { :git => "https://github.com/httpswift/swifter.git", :tag => "1.5.0" }
-  s.source_files          = 'XCode/Sources/*.{swift}'
+  s.source_files          = 'Xcode/Sources/*.{swift}'
   s.swift_version         = '4.2'
 
 end