Skip to content

Commit 4687a21

Browse files
authored
Merge pull request #38 from wickwirew/swift5
Swift5
2 parents 40cdfba + e3e4b40 commit 4687a21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1122
-702
lines changed

.swiftlint.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
disabled_rules:
2+
- identifier_name
3+
- trailing_whitespace
4+
- cyclomatic_complexity
5+
included:
6+
- Sources

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ matrix:
33
include:
44
- os: osx
55
env: JOB=SwiftPM_OSX
6-
osx_image: xcode10
6+
osx_image: xcode10.2
77
- os: linux
88
env: JOB=SwiftPM_linux
99
dist: trusty

Package.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"repositoryURL": "https://github.com/wickwirew/CRuntime.git",
77
"state": {
88
"branch": null,
9-
"revision": "8d0dd0ca3787d15682c1f44de3d298459870b121",
10-
"version": "1.0.0"
9+
"revision": "1d820f9211a9836ea30735c3fe0d77908fd230ff",
10+
"version": "2.0.1"
1111
}
1212
}
1313
]

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.0
22
import PackageDescription
33
let package = Package(
44
name: "Runtime",
55
products: [
66
.library(
77
name: "Runtime",
8-
targets: ["Runtime"]),
8+
targets: ["Runtime"])
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/wickwirew/CRuntime.git", from: "1.0.0")
11+
.package(url: "https://github.com/wickwirew/CRuntime.git", from: "2.0.1")
1212
],
1313
targets: [
1414
.target(
@@ -18,5 +18,5 @@ let package = Package(
1818
name: "RuntimeTests",
1919
dependencies: ["Runtime"])
2020
],
21-
swiftLanguageVersions: [.v4_2]
21+
swiftLanguageVersions: [.v5]
2222
)

Runtime.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = "Runtime"
4-
s.version = "0.7.1"
4+
s.version = "2.0.0"
55
s.summary = "Runtime"
66
s.description = <<-DESC
77
Runtime abilities for native swift objects.
@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
1010
s.license = "MIT"
1111
s.author = { "Wesley Wickwire" => "[email protected]" }
1212
s.platform = :ios, "9.0"
13-
s.source = { :git => "https://github.com/wickwirew/Runtime.git", :tag => "0.7.1" }
13+
s.source = { :git => "https://github.com/wickwirew/Runtime.git", :tag => s.version }
1414
s.source_files = 'Runtime/**/*.swift'
1515
end

0 commit comments

Comments
 (0)