Skip to content

Commit f6ecda7

Browse files
soffessoffes
committed
Update Package.swift for Swift 4
1 parent b79a7c3 commit f6ecda7

File tree

7 files changed

+42
-32
lines changed

7 files changed

+42
-32
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1
1+
4.0

‎Diff.xcodeproj/project.pbxproj

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
2175D3CE1D17268C009C6845 /* Diff.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2175D3C41D17268C009C6845 /* Diff.framework */; };
2121
2175D3F71D1726A8009C6845 /* Diff.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2175D3ED1D1726A8009C6845 /* Diff.framework */; };
2222
2175D4121D1726E9009C6845 /* Diff.h in Headers */ = {isa = PBXBuildFile; fileRef = 2175D4091D1726E9009C6845 /* Diff.h */; settings = {ATTRIBUTES = (Public, ); }; };
23-
2175D41A1D172706009C6845 /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4181D172706009C6845 /* Diff+NSString.swift */; };
24-
2175D41B1D172706009C6845 /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4191D172706009C6845 /* Diff.swift */; };
2523
2175D4291D172713009C6845 /* Diff.h in Headers */ = {isa = PBXBuildFile; fileRef = 2175D4091D1726E9009C6845 /* Diff.h */; settings = {ATTRIBUTES = (Public, ); }; };
2624
2175D42A1D172714009C6845 /* Diff.h in Headers */ = {isa = PBXBuildFile; fileRef = 2175D4091D1726E9009C6845 /* Diff.h */; settings = {ATTRIBUTES = (Public, ); }; };
2725
2175D42B1D172714009C6845 /* Diff.h in Headers */ = {isa = PBXBuildFile; fileRef = 2175D4091D1726E9009C6845 /* Diff.h */; settings = {ATTRIBUTES = (Public, ); }; };
28-
2175D42C1D172730009C6845 /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4191D172706009C6845 /* Diff.swift */; };
29-
2175D42D1D172730009C6845 /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4181D172706009C6845 /* Diff+NSString.swift */; };
30-
2175D42E1D172731009C6845 /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4191D172706009C6845 /* Diff.swift */; };
31-
2175D42F1D172731009C6845 /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4181D172706009C6845 /* Diff+NSString.swift */; };
32-
2175D4301D172731009C6845 /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4191D172706009C6845 /* Diff.swift */; };
33-
2175D4311D172731009C6845 /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D4181D172706009C6845 /* Diff+NSString.swift */; };
26+
21CE6AC11FEF60A200227C1A /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */; };
27+
21CE6AC21FEF60A200227C1A /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6AC01FEF60A200227C1A /* Diff.swift */; };
28+
21CE6AC31FEF60A500227C1A /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6AC01FEF60A200227C1A /* Diff.swift */; };
29+
21CE6AC41FEF60A500227C1A /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */; };
30+
21CE6AC51FEF60A600227C1A /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6AC01FEF60A200227C1A /* Diff.swift */; };
31+
21CE6AC61FEF60A600227C1A /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */; };
32+
21CE6AC71FEF60A600227C1A /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6AC01FEF60A200227C1A /* Diff.swift */; };
33+
21CE6AC81FEF60A600227C1A /* Diff+NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */; };
3434
/* End PBXBuildFile section */
3535

3636
/* Begin PBXContainerItemProxy section */
@@ -71,8 +71,8 @@
7171
2175D3F61D1726A8009C6845 /* DiffTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DiffTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7272
2175D4091D1726E9009C6845 /* Diff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Diff.h; sourceTree = "<group>"; };
7373
2175D40A1D1726E9009C6845 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
74-
2175D4181D172706009C6845 /* Diff+NSString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Diff+NSString.swift"; sourceTree = "<group>"; };
75-
2175D4191D172706009C6845 /* Diff.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Diff.swift; sourceTree = "<group>"; };
74+
21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Diff+NSString.swift"; path = "Diff/Diff+NSString.swift"; sourceTree = "<group>"; };
75+
21CE6AC01FEF60A200227C1A /* Diff.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Diff.swift; path = Diff/Diff.swift; sourceTree = "<group>"; };
7676
/* End PBXFileReference section */
7777

7878
/* Begin PBXFrameworksBuildPhase section */
@@ -186,8 +186,8 @@
186186
2175D4171D172706009C6845 /* Sources */ = {
187187
isa = PBXGroup;
188188
children = (
189-
2175D4191D172706009C6845 /* Diff.swift */,
190-
2175D4181D172706009C6845 /* Diff+NSString.swift */,
189+
21CE6AC01FEF60A200227C1A /* Diff.swift */,
190+
21CE6ABF1FEF60A200227C1A /* Diff+NSString.swift */,
191191
);
192192
path = Sources;
193193
sourceTree = "<group>";
@@ -368,7 +368,7 @@
368368
TargetAttributes = {
369369
2175D3A41D17267D009C6845 = {
370370
CreatedOnToolsVersion = 7.3.1;
371-
LastSwiftMigration = 0800;
371+
LastSwiftMigration = 0920;
372372
};
373373
2175D3AE1D17267D009C6845 = {
374374
CreatedOnToolsVersion = 7.3.1;
@@ -471,8 +471,8 @@
471471
isa = PBXSourcesBuildPhase;
472472
buildActionMask = 2147483647;
473473
files = (
474-
2175D41B1D172706009C6845 /* Diff.swift in Sources */,
475-
2175D41A1D172706009C6845 /* Diff+NSString.swift in Sources */,
474+
21CE6AC21FEF60A200227C1A /* Diff.swift in Sources */,
475+
21CE6AC11FEF60A200227C1A /* Diff+NSString.swift in Sources */,
476476
);
477477
runOnlyForDeploymentPostprocessing = 0;
478478
};
@@ -490,8 +490,8 @@
490490
isa = PBXSourcesBuildPhase;
491491
buildActionMask = 2147483647;
492492
files = (
493-
2175D4311D172731009C6845 /* Diff+NSString.swift in Sources */,
494-
2175D4301D172731009C6845 /* Diff.swift in Sources */,
493+
21CE6AC41FEF60A500227C1A /* Diff+NSString.swift in Sources */,
494+
21CE6AC31FEF60A500227C1A /* Diff.swift in Sources */,
495495
);
496496
runOnlyForDeploymentPostprocessing = 0;
497497
};
@@ -509,17 +509,17 @@
509509
isa = PBXSourcesBuildPhase;
510510
buildActionMask = 2147483647;
511511
files = (
512-
2175D42F1D172731009C6845 /* Diff+NSString.swift in Sources */,
513-
2175D42E1D172731009C6845 /* Diff.swift in Sources */,
512+
21CE6AC61FEF60A600227C1A /* Diff+NSString.swift in Sources */,
513+
21CE6AC51FEF60A600227C1A /* Diff.swift in Sources */,
514514
);
515515
runOnlyForDeploymentPostprocessing = 0;
516516
};
517517
2175D3E81D1726A8009C6845 /* Sources */ = {
518518
isa = PBXSourcesBuildPhase;
519519
buildActionMask = 2147483647;
520520
files = (
521-
2175D42D1D172730009C6845 /* Diff+NSString.swift in Sources */,
522-
2175D42C1D172730009C6845 /* Diff.swift in Sources */,
521+
21CE6AC81FEF60A600227C1A /* Diff+NSString.swift in Sources */,
522+
21CE6AC71FEF60A600227C1A /* Diff.swift in Sources */,
523523
);
524524
runOnlyForDeploymentPostprocessing = 0;
525525
};
@@ -679,6 +679,7 @@
679679
2175D3BA1D17267D009C6845 /* Debug */ = {
680680
isa = XCBuildConfiguration;
681681
buildSettings = {
682+
CLANG_ENABLE_MODULES = YES;
682683
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
683684
DEFINES_MODULE = YES;
684685
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -688,13 +689,15 @@
688689
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
689690
PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.diff;
690691
PRODUCT_NAME = Diff;
692+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
691693
SWIFT_VERSION = 4.0;
692694
};
693695
name = Debug;
694696
};
695697
2175D3BB1D17267D009C6845 /* Release */ = {
696698
isa = XCBuildConfiguration;
697699
buildSettings = {
700+
CLANG_ENABLE_MODULES = YES;
698701
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
699702
DEFINES_MODULE = YES;
700703
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -711,6 +714,7 @@
711714
2175D3BD1D17267D009C6845 /* Debug */ = {
712715
isa = XCBuildConfiguration;
713716
buildSettings = {
717+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
714718
APPLICATION_EXTENSION_API_ONLY = NO;
715719
INFOPLIST_FILE = Tests/Info.plist;
716720
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -723,6 +727,7 @@
723727
2175D3BE1D17267D009C6845 /* Release */ = {
724728
isa = XCBuildConfiguration;
725729
buildSettings = {
730+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
726731
APPLICATION_EXTENSION_API_ONLY = NO;
727732
INFOPLIST_FILE = Tests/Info.plist;
728733
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -773,6 +778,7 @@
773778
2175D3D91D17268C009C6845 /* Debug */ = {
774779
isa = XCBuildConfiguration;
775780
buildSettings = {
781+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
776782
APPLICATION_EXTENSION_API_ONLY = NO;
777783
CODE_SIGN_IDENTITY = "-";
778784
COMBINE_HIDPI_IMAGES = YES;
@@ -789,6 +795,7 @@
789795
2175D3DA1D17268C009C6845 /* Release */ = {
790796
isa = XCBuildConfiguration;
791797
buildSettings = {
798+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
792799
APPLICATION_EXTENSION_API_ONLY = NO;
793800
CODE_SIGN_IDENTITY = "-";
794801
COMBINE_HIDPI_IMAGES = YES;
@@ -877,6 +884,7 @@
877884
2175D4021D1726A8009C6845 /* Debug */ = {
878885
isa = XCBuildConfiguration;
879886
buildSettings = {
887+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
880888
APPLICATION_EXTENSION_API_ONLY = NO;
881889
INFOPLIST_FILE = Tests/Info.plist;
882890
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -891,6 +899,7 @@
891899
2175D4031D1726A8009C6845 /* Release */ = {
892900
isa = XCBuildConfiguration;
893901
buildSettings = {
902+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
894903
APPLICATION_EXTENSION_API_ONLY = NO;
895904
INFOPLIST_FILE = Tests/Info.plist;
896905
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎Package.swift

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
//
2-
// Package.swift
3-
// Diff
4-
//
5-
// Created by Sam Soffes on 4/12/16.
6-
// Copyright © 2016 Sam Soffes. All rights reserved.
7-
//
1+
// swift-tools-version:4.0
82

93
import PackageDescription
104

115
let package = Package(
12-
name: "Diff"
6+
name: "Diff",
7+
products: [
8+
.library(name: "Diff", targets: ["Diff"]),
9+
],
10+
targets: [
11+
.target(name: "Diff"),
12+
.testTarget(name: "DiffTests"),
13+
]
1314
)

‎Readme.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Version](https://img.shields.io/github/release/soffes/Diff.svg)](https://github.com/soffes/Diff/releases)
44
[![Build Status](https://travis-ci.org/soffes/Diff.svg?branch=master)](https://travis-ci.org/soffes/Diff)
5-
![Swift Version](https://img.shields.io/badge/swift-3.0.1-orange.svg)
5+
![Swift Version](https://img.shields.io/badge/swift-4.0-orange.svg)
66
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
77

88
Simple diffing library in pure Swift.

‎Sources/Diff+NSString.swift renamed to ‎Sources/Diff/Diff+NSString.swift

File renamed without changes.

‎Sources/Diff.swift renamed to ‎Sources/Diff/Diff.swift

File renamed without changes.

‎Support/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.2.1</string>
18+
<string>0.2.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)