Skip to content
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.

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

Sync with upstream. #1

Merged
merged 30 commits into from
Jul 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cbfee17
Make title and error labels independent.
Jan 2, 2019
43a9aff
Code clean-up.
Jan 3, 2019
0778c01
Added errorMessageAlignment option.
Jan 7, 2019
c228a9c
Added comments for new public/open vars.
Feb 18, 2019
e008447
Fixed errorLabel.textAlignment.
Feb 18, 2019
348a556
Added updateErrorLabelColor to updateColors.
Feb 18, 2019
8f9f2ad
Fixed comment about errorColor property.
Feb 18, 2019
807edec
ErrorMessagePlacement: Changed some symbol names to be more Swifty, a…
jaredegan Feb 18, 2019
f173076
Merge pull request #1 from gas-buddy/cusomizations-tweaks
spencerdiniz Feb 18, 2019
f83f1bc
Add example of "errorMessagePlacement" property at the "Setting text …
junioreder May 3, 2019
4908d6a
migrated project to swift 5, added swift 5 build target to travis ci,…
Jun 10, 2019
8f0c6a6
enabled xcode recommended build settings, constituting of just extra …
Jun 10, 2019
f955b89
downgraded bundler version used
Jun 10, 2019
8c1f1ce
inverted swift version conditionals to fix build issue on older versi…
Jun 10, 2019
1a6c155
Added full support for the swift package manager
acecilia Sep 1, 2019
8735603
Merge pull request #290 from jessemx109/swift5
k0nserv Dec 5, 2019
24e84c4
[Podpsec] Revert version to 3.7.0 until release
k0nserv Dec 5, 2019
9cfbd12
[CHANGELOG] Update changelog for Swift 5
k0nserv Dec 5, 2019
4010938
Merge pull request #296 from acecilia/feature/swift-package-manager
k0nserv Dec 5, 2019
bc9eb88
[CHANGELOG] Update CHANGELOG for SPM support
k0nserv Dec 5, 2019
029e3e0
[Gems] Update gmes
k0nserv Dec 5, 2019
9c43ba8
[Release] New tag strategy
k0nserv Dec 5, 2019
6c9a451
[podspec] Use the right method
k0nserv Dec 5, 2019
a90b87d
[Rakefile] Update default SDK/Simulator
k0nserv Dec 5, 2019
d988011
[podspec] Stringify verison
k0nserv Dec 5, 2019
82c0bbb
[Release] Version 3.8.0
k0nserv Dec 5, 2019
981eafa
Merge branch 'master' into customizations
junioreder Dec 18, 2019
365fa35
FIX swiftLint warnings and errors
junioreder Dec 18, 2019
73ef34b
DEV Update bundler version
junioreder Dec 18, 2019
dd82b26
Merge pull request #271 from rethink-eder/customizations
k0nserv Jan 7, 2020
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
Prev Previous commit
Next Next commit
[Gems] Update gmes
k0nserv committed Dec 5, 2019

Unverified

This user has not yet uploaded their public signing key.
commit 029e3e0bd9c2674db9d393a80de3e9684a0ea8ce
37 changes: 22 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,68 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.1)
claide (1.0.3)
cocoapods (1.8.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.1)
cocoapods-core (= 1.8.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.2.0, < 3.0)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.2, < 2.0)
cocoapods-core (1.7.1)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.4)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.3.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
minitest (5.11.3)
json (2.2.0)
minitest (5.13.0)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
rake (12.3.2)
rake (13.0.1)
rouge (2.0.7)
ruby-macho (1.4.0)
semver2 (3.4.2)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.9.0)
xcodeproj (1.13.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -81,4 +88,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.17.3
2.0.2