 Felix Mau
|
285551c45f
|
Merge branch 'master' into feature/obersavables
|
2018-09-03 19:35:44 +02:00 |
|
|
Felix Mau
|
3975a26232
|
⏪ :: Include Pods in repo in order to make symlink Pods.xcodeproj work (used for Carthage support)
|
2018-09-03 19:35:02 +02:00 |
|
|
Felix Mau
|
691e1305c5
|
🚸 :: Updated example application
|
2018-09-03 18:43:05 +02:00 |
|
|
Felix Mau
|
b4c07042c1
|
Merge branch 'master' into feature/swift-4.2
# Conflicts:
# .swiftformat
# Example/Podfile.lock
# Example/Pods/Local Podspecs/GradientLoadingBar.podspec.json
# Example/Pods/Manifest.lock
# Example/Pods/Pods.xcodeproj/project.pbxproj
# Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/GradientLoadingBar.xcscheme
# Example/Pods/SwiftFormat/CommandLineTool/swiftformat
# Example/Pods/SwiftFormat/README.md
# Example/Pods/SwiftLint/swiftlint
# Example/Pods/Target Support Files/GradientLoadingBar/GradientLoadingBar.xcconfig
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-acknowledgements.markdown
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-acknowledgements.plist
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-frameworks.sh
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example.debug.xcconfig
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example.release.xcconfig
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Tests/Pods-GradientLoadingBar_Tests.debug.xcconfig
# Example/Pods/Target Support Files/Pods-GradientLoadingBar_Tests/Pods-GradientLoadingBar_Tests.release.xcconfig
# GradientLoadingBar/Classes/ViewModel/GradientLoadingBarViewModel.swift
# Scripts/swift-format.sh
|
2018-08-19 12:56:54 +02:00 |
|
|
Felix Mau
|
0c44f6f3a7
|
* remove pods
|
2018-08-19 12:43:52 +02:00 |
|
|
Felix Mau
|
ed722cb70d
|
* updated pods
* added `Observable` pod as dependency for `GradientLoadingBar`
|
2018-08-18 13:22:34 +02:00 |
|
|
Felix Mau
|
f120514677
|
* exclude pod directory
This will fix an issue with Carthage, as the `_Pods.xcodeproj` is a symlink to `Example/Pods/Pods.xcodeproj` which now can be resolved.
|
2018-06-03 11:03:42 +02:00 |
|