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

Xcode12
daisuke-t-jp · Sep 23, 2020 · c1faa84 · c1faa84
2 parents cb739c3 + c4fe25e
commit c1faa84
Show file tree

Hide file tree

Showing 64 changed files with 1,890 additions and 7,825 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,3 @@ Carthage/
 # SwiftPM
 /.build
 /Packages
-
-# jazzy
-undocumented.json
diff --git a/.jazzy.yaml b/.jazzy.yaml
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.0
+5.3
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,11 @@ matrix:
   include:
     - os: osx
       language: swift
-      osx_image: xcode10.2
+      osx_image: xcode12
       script:
         # iOS
         - xcodebuild clean -project "MurmurHash.xcodeproj" 
-        - xcodebuild test -project "MurmurHash.xcodeproj" -scheme "MurmurHash-iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone X" -configuration Debug
+        - xcodebuild test -project "MurmurHash.xcodeproj" -scheme "MurmurHash-iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 11 Pro Max" -configuration Debug
 
         # macOS
         - xcodebuild clean -project "MurmurHash.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
diff --git a/MurmurHash-Swift.podspec b/MurmurHash-Swift.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |spec|
 
   # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   spec.name         = "MurmurHash-Swift"
-  spec.version      = "1.0.13"
+  spec.version      = "1.1.0"
   spec.summary      = "MurmurHash framework in Swift."
 
   spec.description  = <<-DESC
@@ -37,7 +37,7 @@ Pod::Spec.new do |spec|
 
 
   # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  spec.swift_version = "5.0"
+  spec.swift_version = "5.3"
   spec.requires_arc = true
 
 end
diff --git a/MurmurHash.xcodeproj/project.pbxproj b/MurmurHash.xcodeproj/project.pbxproj
@@ -337,7 +337,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = MurmurHash;
 				TargetAttributes = {
 					0290FBB7220C01610076E82F = {
@@ -701,6 +701,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -764,6 +765,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-iOS.xcscheme b/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "029CB1F6220A9D6C00FA2648"
+            BuildableName = "MurmurHash.framework"
+            BlueprintName = "MurmurHash-iOS"
+            ReferencedContainer = "container:MurmurHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "029CB1F6220A9D6C00FA2648"
-            BuildableName = "MurmurHash.framework"
-            BlueprintName = "MurmurHash-iOS"
-            ReferencedContainer = "container:MurmurHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:MurmurHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-macOS.xcscheme b/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0290FBB7220C01610076E82F"
+            BuildableName = "MurmurHash.framework"
+            BlueprintName = "MurmurHash-macOS"
+            ReferencedContainer = "container:MurmurHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0290FBB7220C01610076E82F"
-            BuildableName = "MurmurHash.framework"
-            BlueprintName = "MurmurHash-macOS"
-            ReferencedContainer = "container:MurmurHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:MurmurHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-tvOS.xcscheme b/MurmurHash.xcodeproj/xcshareddata/xcschemes/MurmurHash-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7E3D40B122114F8B00A66B74"
+            BuildableName = "MurmurHash.framework"
+            BlueprintName = "MurmurHash-tvOS"
+            ReferencedContainer = "container:MurmurHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7E3D40B122114F8B00A66B74"
-            BuildableName = "MurmurHash.framework"
-            BlueprintName = "MurmurHash-tvOS"
-            ReferencedContainer = "container:MurmurHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:MurmurHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Package.swift b/Package.swift
@@ -5,30 +5,30 @@ import PackageDescription
 
 #if os(Linux) || os(macOS) || os(iOS) || os(tvOS)
 let package = Package(
-  name: "MurmurHash-Swift",
-  products: [
-    // Products define the executables and libraries produced by a package, and make them visible to other packages.
-    .library(
-      name: "MurmurHash-Swift",
-      targets: ["MurmurHash_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: "MurmurHash_Swift",
-      dependencies: [],
-      path: "Sources/MurmurHash/",
-      exclude: ["MurmurHash.xcodeproj", "README.md", "Sources/MurmurHash/Info.plist", "Sources/MurmurHash/MurmurHash.h"]),
-    .testTarget(
-      name: "MurmurHashTests",
-      dependencies: ["MurmurHash_Swift"]),
-  ],
-  swiftLanguageVersions: [.v5]
+    name: "MurmurHash-Swift",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "MurmurHash-Swift",
+            targets: ["MurmurHash_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: "MurmurHash_Swift",
+            dependencies: [],
+            path: "Sources/MurmurHash/",
+            exclude: ["MurmurHash.xcodeproj", "README.md", "Sources/MurmurHash/Info.plist", "Sources/MurmurHash/MurmurHash.h"]),
+        .testTarget(
+            name: "MurmurHashTests",
+            dependencies: ["MurmurHash_Swift"]),
+    ],
+    swiftLanguageVersions: [.v5]
 )
 #else
 fatalError("Unsupported OS")