Skip to content

Commit

Permalink
Merge pull request #38 from wickwirew/swift5
Browse files Browse the repository at this point in the history
Swift5
  • Loading branch information
wickwirew authored Apr 6, 2019
2 parents 40cdfba + e3e4b40 commit 4687a21
Show file tree
Hide file tree
Showing 59 changed files with 1,122 additions and 702 deletions.
6 changes: 6 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
disabled_rules:
- identifier_name
- trailing_whitespace
- cyclomatic_complexity
included:
- Sources
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ matrix:
include:
- os: osx
env: JOB=SwiftPM_OSX
osx_image: xcode10
osx_image: xcode10.2
- os: linux
env: JOB=SwiftPM_linux
dist: trusty
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/wickwirew/CRuntime.git",
"state": {
"branch": null,
"revision": "8d0dd0ca3787d15682c1f44de3d298459870b121",
"version": "1.0.0"
"revision": "1d820f9211a9836ea30735c3fe0d77908fd230ff",
"version": "2.0.1"
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// swift-tools-version:4.2
// swift-tools-version:5.0
import PackageDescription
let package = Package(
name: "Runtime",
products: [
.library(
name: "Runtime",
targets: ["Runtime"]),
targets: ["Runtime"])
],
dependencies: [
.package(url: "https://github.com/wickwirew/CRuntime.git", from: "1.0.0")
.package(url: "https://github.com/wickwirew/CRuntime.git", from: "2.0.1")
],
targets: [
.target(
Expand All @@ -18,5 +18,5 @@ let package = Package(
name: "RuntimeTests",
dependencies: ["Runtime"])
],
swiftLanguageVersions: [.v4_2]
swiftLanguageVersions: [.v5]
)
4 changes: 2 additions & 2 deletions Runtime.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = "Runtime"
s.version = "0.7.1"
s.version = "2.0.0"
s.summary = "Runtime"
s.description = <<-DESC
Runtime abilities for native swift objects.
Expand All @@ -10,6 +10,6 @@ Pod::Spec.new do |s|
s.license = "MIT"
s.author = { "Wesley Wickwire" => "wickwirew@gmail.com" }
s.platform = :ios, "9.0"
s.source = { :git => "https://github.com/wickwirew/Runtime.git", :tag => "0.7.1" }
s.source = { :git => "https://github.com/wickwirew/Runtime.git", :tag => s.version }
s.source_files = 'Runtime/**/*.swift'
end
Loading

0 comments on commit 4687a21

Please sign in to comment.