Skip to content

Add SPM support #88

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.

Sign up for GitHub

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

Open
kikeenrique wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add SPM support #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3892d9c
update to swift 5 and fix compilation #72
kikeenrique Mar 7, 2021
f8bd811
add support for Swift Package Manager (SPM)
kikeenrique Mar 7, 2021
286d40d
add demo project to test support for Swift Package Manager (SPM)
kikeenrique Mar 30, 2021
546e6ef
migrate ExpandableLabelDemo to swift 5 and update recommended settings.
kikeenrique Mar 30, 2021
8898d69
remove local file ExpandableLabel from ExpandableLabelDemoSPM project
kikeenrique Mar 30, 2021
d8bc7f2
use ExpandableLabel framework from SPM on ExpandableLabelDemoSPM project
kikeenrique Mar 30, 2021
9fd8363
update readme with SPM installation instrucctions
kikeenrique Mar 30, 2021
4cbb1ca
add github CI actions to build ExpandableLabelDemoSPM
kikeenrique Mar 30, 2021
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
46 changes: 46 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: CI
on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: macos-latest
strategy:
matrix:
run-config:
- { xcode_version: '12.4', simulator: 'name=iPhone SE (2nd generation),OS=14.4' }

steps:
- name: Checkout Project
uses: actions/checkout@v1

- name: Brew Update
run: brew update

- name: Install Bundler
run: gem install bundler

- name: Install Core Utils
run: if [ -z "$(brew ls --versions coreutils)" ] ; then brew install coreutils ; fi

- name: Install XCPretty
run: gem install xcpretty --no-document --quiet

- name: Show Xcode versions
run: ls -al /Applications/Xcode*

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.run-config['xcode_version'] }}.app

- name: Current Xcode Selected
run: xcode-select -p

- name: List Simulators
run: xcrun simctl list

- name: Build
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "ExpandableLabelDemoSPM/ExpandableLabelDemoSPM.xcodeproj" -scheme "ExpandableLabelDemoSPM" -destination "${{ matrix.run-config['simulator'] }}" clean build | xcpretty

8 changes: 6 additions & 2 deletions Classes/ExpandableLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ extension ExpandableLabel {
let lineTextWithAddedLink = NSMutableAttributedString(attributedString: lineTextWithLastWordRemoved)
if let ellipsis = self.ellipsis {
lineTextWithAddedLink.append(ellipsis)
lineTextWithAddedLink.append(NSAttributedString(string: " ", attributes: [.font: self.font]))
lineTextWithAddedLink.append(NSAttributedString(string: " ",
attributes: [.font: (self.font ?? UIFont.preferredFont(forTextStyle: .body))]))
}
lineTextWithAddedLink.append(linkName)
let fits = self.textFitsWidth(lineTextWithAddedLink)
Expand Down Expand Up @@ -261,7 +262,8 @@ extension ExpandableLabel {
let linkText = NSMutableAttributedString()
if let ellipsis = self.ellipsis {
linkText.append(ellipsis)
linkText.append(NSAttributedString(string: " ", attributes: [.font: self.font]))
linkText.append(NSAttributedString(string: " ",
attributes: [.font: (self.font ?? UIFont.preferredFont(forTextStyle: .body))]))
}
linkText.append(linkName)

Expand Down Expand Up @@ -546,6 +548,8 @@ extension UILabel {
return 1.0
case .left, .natural, .justified:
return 0.0
@unknown default:
fatalError()
}
}
}
Expand Down
17 changes: 13 additions & 4 deletions ExpandableLabel.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
1B0D8A441F3AAA50004142A4 /* ExpandableLabel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExpandableLabel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1B0D8A501F3AAA6C004142A4 /* ExpandableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpandableLabel.swift; sourceTree = "<group>"; };
1B0D8A511F3AAA6C004142A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F685D23D232A593F0000133D /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -30,6 +31,7 @@
1B0D8A3A1F3AAA50004142A4 = {
isa = PBXGroup;
children = (
F685D23D232A593F0000133D /* Package.swift */,
1B0D8A4F1F3AAA6C004142A4 /* Classes */,
1B0D8A451F3AAA50004142A4 /* Products */,
);
Expand Down Expand Up @@ -89,7 +91,7 @@
1B0D8A3B1F3AAA50004142A4 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1240;
TargetAttributes = {
1B0D8A431F3AAA50004142A4 = {
CreatedOnToolsVersion = 8.3.3;
Expand All @@ -100,10 +102,11 @@
};
buildConfigurationList = 1B0D8A3E1F3AAA50004142A4 /* Build configuration list for PBXProject "ExpandableLabel" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 1B0D8A3A1F3AAA50004142A4;
productRefGroup = 1B0D8A451F3AAA50004142A4 /* Products */;
Expand Down Expand Up @@ -151,15 +154,18 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -211,15 +217,18 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -264,7 +273,7 @@
PRODUCT_BUNDLE_IDENTIFIER = de.apploft.ExpandableLabel;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -282,7 +291,7 @@
PRODUCT_BUNDLE_IDENTIFIER = de.apploft.ExpandableLabel;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
8 changes: 1 addition & 7 deletions ExpandableLabel.xcodeproj/xcshareddata/xcschemes/ExpandableLabel.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,18 +26,14 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -53,8 +49,6 @@
ReferencedContainer = "container:ExpandableLabel.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
14 changes: 9 additions & 5 deletions ExpandableLabelDemo/ExpandableLabelDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1010;
LastUpgradeCheck = 1240;
ORGANIZATIONNAME = "Mathias Koehnke";
TargetAttributes = {
BF4342991B416FDD002FDE1F = {
CreatedOnToolsVersion = 6.3.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1240;
};
};
};
buildConfigurationList = BF4342951B416FDD002FDE1F /* Build configuration list for PBXProject "ExpandableLabelDemo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -193,6 +193,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -211,6 +212,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -248,6 +250,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -266,6 +269,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -300,7 +304,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.apploft.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -312,7 +316,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.apploft.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Loading