Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
Update to Swift 5.0 and fix missing platforms from Package.swift
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmassicotte committed Aug 22, 2019
1 parent 9d479a3 commit 6c10dce
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
4 changes: 2 additions & 2 deletions OperationPlus.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'OperationPlus'
s.version = '1.2.0'
s.version = '1.3.0'
s.summary = 'NSOperation\'s missing pieces'

s.homepage = 'https://github.com/ChimeHQ/OperationPlus'
Expand All @@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.watchos.deployment_target = '3.0'

s.cocoapods_version = '>= 1.4.0'
s.swift_version = '4.2'
s.swift_version = '5.0'
end
22 changes: 14 additions & 8 deletions OperationPlus.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 7;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -548,10 +549,10 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.3.0;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -563,6 +564,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 7;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -574,9 +576,9 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.3.0;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -592,7 +594,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -608,7 +610,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -620,6 +622,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -631,9 +634,10 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -645,6 +649,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -656,8 +661,9 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion OperationTestingPlus/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.2.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PackageDescription

let package = Package(
name: "OperationPlus",
platforms: [.macOS("10.10")],
platforms: [.macOS(.v10_10), .iOS(.v8), .tvOS(.v10), .watchOS(.v3)],
products: [
.library(name: "OperationPlus", targets: ["OperationPlus"]),
.library(name: "OperationTestingPlus", targets: ["OperationTestingPlus"]),
Expand All @@ -14,5 +14,6 @@ let package = Package(
.target(name: "OperationPlus", dependencies: [], path: "OperationPlus/"),
.target(name: "OperationTestingPlus", dependencies: ["OperationPlus"], path: "OperationTestingPlus/"),
.testTarget(name: "OperationPlusTests", dependencies: ["OperationPlus", "OperationTestingPlus"], path: "OperationPlusTests/"),
]
],
swiftLanguageVersions: [.v5]
)

0 comments on commit 6c10dce

Please sign in to comment.