Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 5.2 #306

Merged
merged 1 commit into from
May 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1
5.2
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.1
// swift-tools-version:5.2
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -13,7 +13,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/ashleymills/Reachability.swift", .upToNextMinor(from: "5.0.0"))
.package(name: "Reachability", url: "https://github.com/ashleymills/Reachability.swift", .upToNextMinor(from: "5.0.0"))
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
1 change: 0 additions & 1 deletion Sources/SwiftQueue/JobBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ public final class JobBuilder {
return self
}


/// Connectivity constraint.
public func internet(atLeast: NetworkType) -> Self {
info.requireNetwork = atLeast
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftQueue/Utils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,4 @@ internal extension String {
return data
}

}
}
2 changes: 1 addition & 1 deletion SwiftQueue.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.author = { "Lucas Nelaupe" => "lucas.nelaupe@gmail.com" }
s.source = { :git => "https://github.com/lucas34/SwiftQueue.git", :tag => s.version.to_s }

s.swift_version = '5.1'
s.swift_version = '5.2'

s.ios.deployment_target = "8.0"
s.tvos.deployment_target= "9.0"
Expand Down
20 changes: 10 additions & 10 deletions SwiftQueue.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Debug;
Expand All @@ -587,7 +587,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Release;
Expand All @@ -611,7 +611,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchsimulator watchos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Debug;
Expand All @@ -635,7 +635,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchsimulator watchos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Release;
Expand All @@ -659,7 +659,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Debug;
Expand All @@ -683,7 +683,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueue;
};
name = Release;
Expand All @@ -707,7 +707,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.0;
TARGET_NAME = SwiftQueue;
};
name = Debug;
Expand All @@ -731,7 +731,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.0;
TARGET_NAME = SwiftQueue;
};
name = Release;
Expand All @@ -750,7 +750,7 @@
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/build/Mac";
OTHER_LDFLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited)";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueueTests;
};
name = Debug;
Expand All @@ -769,7 +769,7 @@
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/build/Mac";
OTHER_LDFLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited)";
SWIFT_VERSION = 5.1;
SWIFT_VERSION = 5.2;
TARGET_NAME = SwiftQueueTests;
};
name = Release;
Expand Down
5 changes: 1 addition & 4 deletions Tests/SwiftQueueTests/BackgroundTasksTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class BackgroundTasksTest {
job.assertNoRun()
}


@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
public func testBuilderPeriodicLimited() throws {
for serializer in serializers {
Expand Down Expand Up @@ -109,6 +108,4 @@ class BackgroundTasksTest {
XCTAssertTrue([id, id2].contains(result[1].info.uuid))
}



}
}
1 change: 0 additions & 1 deletion Tests/SwiftQueueTests/TestUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,3 @@ func toJobInfo(_ serializer: JobInfoSerializer, type: String, _ builder: JobBuil

return try serializer.deserialize(json: persister.putData[0])
}