Merge pull request #2 from daisuke-t-jp/xcode12

Xcode12

.gitignore

@@ -28,6 +28,3 @@ Carthage/
 # SwiftPM
 /.build
 /Packages
-
-# jazzy
-undocumented.json

.swift-version

@@ -1 +1 @@
-5.0
+5.3

.travis.yml

@@ -6,11 +6,11 @@ matrix:
   include:
     - os: osx
       language: swift
-      osx_image: xcode10.2
+      osx_image: xcode12
       script:
         # iOS
         - xcodebuild clean -project "xxHash.xcodeproj" 
-        - xcodebuild test -project "xxHash.xcodeproj" -scheme "xxHash-iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone X" -configuration Debug
+        - xcodebuild test -project "xxHash.xcodeproj" -scheme "xxHash-iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 11 Pro Max" -configuration Debug
 
         # macOS
         - xcodebuild clean -project "xxHash.xcodeproj" 
@@ -54,8 +54,8 @@ matrix:
             - tzdata
             - rsync
       script:
-        - wget https://swift.org/builds/swift-5.0-release/ubuntu1604/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu16.04.tar.gz
-        - tar xvfz swift-5.0-RELEASE-ubuntu16.04.tar.gz
-        - export PATH=$(pwd)/swift-5.0-RELEASE-ubuntu16.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-5.3-release/ubuntu1604/swift-5.3-RELEASE/swift-5.3-RELEASE-ubuntu16.04.tar.gz
+        - tar xvfz swift-5.3-RELEASE-ubuntu16.04.tar.gz
+        - export PATH=$(pwd)/swift-5.3-RELEASE-ubuntu16.04/usr/bin:"${PATH}"
         - swift build
         - swift test

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Daisuke T
+Copyright (c) 2019 Daisuke TONOSAKI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -5,30 +5,30 @@ import PackageDescription
 
 #if os(Linux) || os(macOS) || os(iOS) || os(tvOS)
 let package = Package(
-  name: "xxHash-Swift",
-  products: [
-    // Products define the executables and libraries produced by a package, and make them visible to other packages.
-    .library(
-      name: "xxHash-Swift",
-      targets: ["xxHash_Swift"]),
-  ],
-  dependencies: [
-    // Dependencies declare other packages that this package depends on.
-    // .package(url: /* package url */, from: "1.0.0"),
-  ],
-  targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-    .target(
-      name: "xxHash_Swift",
-      dependencies: [],
-      path: "Sources/xxHash/",
-      exclude: ["xxHash.xcodeproj", "README.md", "Sources/xxHash/Info.plist", "Sources/xxHash/xxHash.h"]),
-    .testTarget(
-      name: "xxHashTests",
-      dependencies: ["xxHash_Swift"]),
-  ],
-  swiftLanguageVersions: [.v5]
+    name: "xxHash-Swift",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "xxHash-Swift",
+            targets: ["xxHash_Swift"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "xxHash_Swift",
+            dependencies: [],
+            path: "Sources/xxHash/",
+            exclude: ["xxHash.xcodeproj", "README.md", "Sources/xxHash/Info.plist", "Sources/xxHash/xxHash.h"]),
+        .testTarget(
+            name: "xxHashTests",
+            dependencies: ["xxHash_Swift"]),
+    ],
+    swiftLanguageVersions: [.v5]
 )
 #else
 fatalError("Unsupported OS")

README.md

@@ -14,8 +14,6 @@
 A framework includes XXH32/XXH64/XXH3-64/XXH3-128 functions.  
 
 Original xxHash algorithm created by [Yann Collet](https://github.com/Cyan4973).
-
-[Documentation](https://daisuke-t-jp.github.io/xxHash-Swift/)
 
 
 # Requirements
@@ -40,23 +38,6 @@ pod 'xxHash-Swift'
 end
 ```
 
-## Swift Package Manager
-```swift
-import PackageDescription
-
-let package = Package(
-  name: "YOUR_PACKAGE_NAME",
-  dependencies: [
-    .package(url: "https://github.com/daisuke-t-jp/xxHash-Swift.git", from: "1.0.12")
-  ],
-  targets: [
-    .target(
-      name: "YOUR_TARGET_NAME",
-      dependencies: ["xxHash-Swift"]),
-  ]
-)
-```
-
 
 # Usage
 ## Import framework
@@ -91,18 +72,18 @@ let bufSize = 1024
 var index = 0
 
 repeat {
-  var lastIndex = index + bufSize
-  if lastIndex > data.count {
-    lastIndex = index + data.count - index
-  }
-
-  let data2 = data[index..<lastIndex]
-  xxh.update(data2) // xxHash update
-
-  index += data2.count
-  if index >= data.count {
-    break
-  }
+    var lastIndex = index + bufSize
+    if lastIndex > data.count {
+        lastIndex = index + data.count - index
+    }
+
+    let data2 = data[index..<lastIndex]
+    xxh.update(data2) // xxHash update
+
+    index += data2.count
+    if index >= data.count {
+        break
+    }
 } while(true)
 
 let digest = xxh.digest()
@@ -135,18 +116,18 @@ let bufSize = 1024
 var index = 0
 
 repeat {
-  var lastIndex = index + bufSize
-  if lastIndex > data.count {
-    lastIndex = index + data.count - index
-  }
-
-  let data2 = data[index..<lastIndex]
-  xxh.update(data2) // xxHash update
-
-  index += data2.count
-  if index >= data.count {
-    break
-  }
+    var lastIndex = index + bufSize
+    if lastIndex > data.count {
+        lastIndex = index + data.count - index
+    }
+
+    let data2 = data[index..<lastIndex]
+    xxh.update(data2) // xxHash update
+
+    index += data2.count
+    if index >= data.count {
+        break
+    }
 } while(true)
 
 let digest = xxh.digest()

Sources/xxHash/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.13</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 xxHash. All rights reserved.</string>
+	<string>Copyright © 2019 Daisuke TONOSAKI. All rights reserved.</string>
 </dict>
 </plist>