Skip to content

Commit

Permalink
Merge branch 'release/1.4.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackjacx committed Jul 12, 2018
2 parents 4064a8d + 2dd4c04 commit 8fcbe9c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [Unreleased]

## [1.4.3] - 2018-07-12
* [#39](https://github.com/Blackjacx/SHSearchBar/pull/39): Make localized extension internal - [@blackjacx](https://github.com/blackjacx).

## [1.4.2] - 2018-07-12
* [#38](https://github.com/Blackjacx/SHSearchBar/pull/38): Make String Extension `localized` Internal To Avoid Naming Conflicts - [@blackjacx](https://github.com/blackjacx).

Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Nimble (7.0.3)
- Quick (1.2.0)
- SHSearchBar (1.4.1)
- SHSearchBar (1.4.2)

DEPENDENCIES:
- Nimble (~> 7.0.2)
Expand All @@ -20,7 +20,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
SHSearchBar: 10bb160cb787b1a6bf52fe7ae1176161386eb0b9
SHSearchBar: 1dbf4c712c66c764c5463471f86c37b20df9bcfe

PODFILE CHECKSUM: b2f7b434f9f12c2e8304b00e3983b43b76652086

Expand Down
4 changes: 2 additions & 2 deletions Example/SHSearchBar.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
baseConfigurationReference = 4E5D9DD31A134DBDCBF6B0BD /* Pods-SHSearchBar_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = PCW579R278;
INFOPLIST_FILE = SHSearchBar/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -552,7 +552,7 @@
baseConfigurationReference = 53F3CEB9AA62FFC13214F692 /* Pods-SHSearchBar_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = PCW579R278;
INFOPLIST_FILE = SHSearchBar/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
4 changes: 2 additions & 2 deletions Example/SHSearchBar/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.2</string>
<string>1.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3</string>
<string>4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
4 changes: 2 additions & 2 deletions Example/Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.2</string>
<string>1.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3</string>
<string>4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion SHSearchBar.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SHSearchBar'
s.version = '1.4.2'
s.version = '1.4.3'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'The search bar that does not suck.'
s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions SHSearchBar/Classes/Foundation + Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

import Foundation

public extension String {
extension String {

private class AFrameworkClass {}

var localized: String {
internal var localized: String {
let appTranslation = NSLocalizedString(self, comment: "")

if appTranslation != self {
Expand Down

0 comments on commit 8fcbe9c

Please sign in to comment.