Skip to content

Commit

Permalink
Update to swift 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
k-lpmg committed Feb 13, 2019
1 parent e8bd024 commit 73dcf65
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Tagging
[![Cocoapods](https://img.shields.io/cocoapods/v/Tagging.svg?style=flat)](https://cocoapods.org/pods/Tagging)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg)
![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)](https://raw.githubusercontent.com/k-lpmg/RealmWrapper/master/LICENSE)
[![Build Status](https://travis-ci.org/k-lpmg/Tagging.svg?branch=master)](https://travis-ci.org/k-lpmg/Tagging)

Expand Down
20 changes: 10 additions & 10 deletions Sources/Tagging/Tagging.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ open class Tagging: UIView {

open var symbol: String = "@"
open var tagableList: [String]?
open var defaultAttributes: [NSAttributedStringKey: Any] = {
return [NSAttributedStringKey.foregroundColor: UIColor.black,
NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 15),
NSAttributedStringKey.underlineStyle: NSNumber(value: 0)]
open var defaultAttributes: [NSAttributedString.Key: Any] = {
return [NSAttributedString.Key.foregroundColor: UIColor.black,
NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15),
NSAttributedString.Key.underlineStyle: NSNumber(value: 0)]
}()
open var symbolAttributes: [NSAttributedStringKey: Any] = {
return [NSAttributedStringKey.foregroundColor: UIColor.black,
NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 15),
NSAttributedStringKey.underlineStyle: NSNumber(value: 0)]
open var symbolAttributes: [NSAttributedString.Key: Any] = {
return [NSAttributedString.Key.foregroundColor: UIColor.black,
NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15),
NSAttributedString.Key.underlineStyle: NSNumber(value: 0)]
}()
open var taggedAttributes: [NSAttributedStringKey: Any] = {return [NSAttributedStringKey.underlineStyle: NSNumber(value: 1)]}()
open var taggedAttributes: [NSAttributedString.Key: Any] = {return [NSAttributedString.Key.underlineStyle: NSNumber(value: 1)]}()

public private(set) var taggedList: [TaggingModel] = []
public weak var dataSource: TaggingDataSource?
Expand All @@ -63,7 +63,7 @@ open class Tagging: UIView {

// MARK: - UI Components

open let textView: UITextView = {
public let textView: UITextView = {
let textView = UITextView()
textView.translatesAutoresizingMaskIntoConstraints = false
return textView
Expand Down
File renamed without changes.
28 changes: 10 additions & 18 deletions Tagging.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,15 @@

/* Begin PBXBuildFile section */
6523AB9620FB7CF300AA0252 /* TaggingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6523AB9520FB7CF300AA0252 /* TaggingViewController.swift */; };
6523AB9820FB7D2D00AA0252 /* Tagging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6583BE0020E951250047896D /* Tagging.framework */; };
656201E42122559A000E209D /* TaggingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656201DF21225599000E209D /* TaggingModel.swift */; };
656201E52122559A000E209D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 656201E021225599000E209D /* Info.plist */; };
656201E62122559A000E209D /* Tagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656201E121225599000E209D /* Tagging.swift */; };
656201E72122559A000E209D /* TaggingDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 656201E22122559A000E209D /* TaggingDataSource.swift */; };
656201E8212255E5000E209D /* Tagging.h in Headers */ = {isa = PBXBuildFile; fileRef = 656201DE21225599000E209D /* Tagging.h */; settings = {ATTRIBUTES = (Public, ); }; };
65854A8320E9595C00124501 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65854A8220E9595C00124501 /* AppDelegate.swift */; };
65854A8E20E9596800124501 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 65854A8820E9596800124501 /* Assets.xcassets */; };
65854A8F20E9596800124501 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 65854A8920E9596800124501 /* LaunchScreen.storyboard */; };
65854A9020E9596800124501 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 65854A8B20E9596800124501 /* Main.storyboard */; };
65854A9120E9596800124501 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 65854A8D20E9596800124501 /* Info.plist */; };
65B08B0020FD6DE800D19DE8 /* TaggingExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65B08AFE20FD6DE800D19DE8 /* TaggingExampleUITests.swift */; };
65B08B0120FD6DE800D19DE8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 65B08AFF20FD6DE800D19DE8 /* Info.plist */; };
65E42F8D20FD6C3000175C45 /* Tagging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6583BE0020E951250047896D /* Tagging.framework */; };
65E42F8E20FD6C3000175C45 /* Tagging.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6583BE0020E951250047896D /* Tagging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -59,9 +55,9 @@
/* Begin PBXFileReference section */
6523AB9520FB7CF300AA0252 /* TaggingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaggingViewController.swift; sourceTree = "<group>"; };
6560590D20FD6DA300A3BBCD /* TaggingExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TaggingExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
656201DE21225599000E209D /* Tagging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Tagging.h; path = Tagging/Tagging.h; sourceTree = "<group>"; };
656201DE21225599000E209D /* Tagging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tagging.h; sourceTree = "<group>"; };
656201DF21225599000E209D /* TaggingModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TaggingModel.swift; path = Tagging/TaggingModel.swift; sourceTree = "<group>"; };
656201E021225599000E209D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tagging/Info.plist; sourceTree = "<group>"; };
656201E021225599000E209D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
656201E121225599000E209D /* Tagging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Tagging.swift; path = Tagging/Tagging.swift; sourceTree = "<group>"; };
656201E22122559A000E209D /* TaggingDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TaggingDataSource.swift; path = Tagging/TaggingDataSource.swift; sourceTree = "<group>"; };
6583BE0020E951250047896D /* Tagging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Tagging.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -95,7 +91,6 @@
buildActionMask = 2147483647;
files = (
65E42F8D20FD6C3000175C45 /* Tagging.framework in Frameworks */,
6523AB9820FB7D2D00AA0252 /* Tagging.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -112,9 +107,11 @@
6583BDF620E951250047896D = {
isa = PBXGroup;
children = (
656201DE21225599000E209D /* Tagging.h */,
656201E021225599000E209D /* Info.plist */,
6583BE1E20E9516C0047896D /* Sources */,
65854A7320E957A300124501 /* Example */,
65B08AFD20FD6DE800D19DE8 /* Tests */,
65854A7320E957A300124501 /* Example */,
6523AB9720FB7D2D00AA0252 /* Frameworks */,
6583BE0120E951250047896D /* Products */,
);
Expand All @@ -133,8 +130,6 @@
6583BE1E20E9516C0047896D /* Sources */ = {
isa = PBXGroup;
children = (
656201E021225599000E209D /* Info.plist */,
656201DE21225599000E209D /* Tagging.h */,
656201E121225599000E209D /* Tagging.swift */,
656201E22122559A000E209D /* TaggingDataSource.swift */,
656201DF21225599000E209D /* TaggingModel.swift */,
Expand Down Expand Up @@ -256,7 +251,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0940;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "k-lpmg";
TargetAttributes = {
6560590C20FD6DA300A3BBCD = {
Expand Down Expand Up @@ -298,23 +293,20 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
65B08B0120FD6DE800D19DE8 /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
6583BDFE20E951250047896D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
656201E52122559A000E209D /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
65854A5F20E9578100124501 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
65854A9120E9596800124501 /* Info.plist in Resources */,
65854A9020E9596800124501 /* Main.storyboard in Resources */,
65854A8E20E9596800124501 /* Assets.xcassets in Resources */,
65854A8F20E9596800124501 /* LaunchScreen.storyboard in Resources */,
Expand Down Expand Up @@ -561,7 +553,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Tagging/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -573,7 +565,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -589,7 +581,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Tagging/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -600,7 +592,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Tagging.xcodeproj/xcshareddata/xcschemes/Tagging.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 73dcf65

Please sign in to comment.