Skip to content

Commit 5500807

Browse files
committed
Fix merge conflicts
1 parent c19d9d7 commit 5500807

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
platforms: [
88
.macOS(.v11),
99
.iOS(.v14),
10-
.watchOS(.v6)
10+
.watchOS(.v7)
1111
],
1212
products: [
1313
.library(

README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ ___
88

99
<p> We are a development agency building
1010
<a href="https://clutch.co/profile/exyte#review-731233">phenomenal</a> apps.</p>
11-
</br>
1211

1312
<a href="https://exyte.com/contacts"><img src="https://i.imgur.com/vGjsQPt.png" width="134" height="34"></a> <a href="https://twitter.com/exyteHQ"><img src="https://i.imgur.com/DngwSn1.png" width="165" height="34"></a>
1413

15-
</br></br>
16-
[![Travis CI](https://travis-ci.org/exyte/SVGView.svg?branch=master)](https://travis-ci.org/exyte/SVGView)
17-
[![Version](https://img.shields.io/cocoapods/v/SVGView.svg?style=flat)](http://cocoapods.org/pods/SVGView)
18-
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-0473B3.svg?style=flat)](https://github.com/Carthage/Carthage)
19-
[![License](https://img.shields.io/cocoapods/l/SVGView.svg?style=flat)](http://cocoapods.org/pods/SVGView)
20-
[![Platform](https://img.shields.io/cocoapods/p/SVGView.svg?style=flat)](http://cocoapods.org/pods/SVGView)
21-
[![Twitter](https://img.shields.io/badge/[email protected]?style=flat)](http://twitter.com/exyteHQ)
14+
[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fexyte%2FSVGView%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/exyte/SVGView)
15+
[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fexyte%2FSVGView%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/exyte/SVGView)
16+
[![SPM Compatible](https://img.shields.io/badge/SwiftPM-Compatible-brightgreen.svg)](https://swiftpackageindex.com/exyte/SVGView)
17+
[![Cocoapods Compatible](https://img.shields.io/badge/cocoapods-Compatible-brightgreen.svg)](https://cocoapods.org/pods/SVGView)
18+
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg?style=flat)](https://github.com/Carthage/Carthage)
19+
[![License: MIT](https://img.shields.io/badge/License-MIT-black.svg)](https://opensource.org/licenses/MIT)
2220

2321
# Overview
2422

@@ -115,14 +113,16 @@ github "Exyte/SVGView"
115113

116114
# Requirements
117115

118-
* iOS 14+ / watchOS 6+ / tvOS 14+ / macOS 11+
119-
* Xcode 11+
116+
* iOS 14+ / watchOS 7+ / macOS 11+
117+
* Xcode 12+
120118

121119
## Our other open source SwiftUI libraries
122120
[PopupView](https://github.com/exyte/PopupView) - Toasts and popups library
123121
[Grid](https://github.com/exyte/Grid) - The most powerful Grid container
124-
[ScalingHeaderScrollView](https://github.com/exyte/ScalingHeaderScrollView) - A scroll view with a sticky header which shrinks as you scroll.
122+
[ScalingHeaderScrollView](https://github.com/exyte/ScalingHeaderScrollView) - A scroll view with a sticky header which shrinks as you scroll
123+
[AnimatedTabBar](https://github.com/exyte/AnimatedTabBar) - A tabbar with number of preset animations
125124
[MediaPicker](https://github.com/exyte/mediapicker) - Customizable media picker
125+
[Chat](https://github.com/exyte/chat) - Chat UI framework with fully customizable message cells, input view, and a built-in media picker
126126
[ConcentricOnboarding](https://github.com/exyte/ConcentricOnboarding) - Animated onboarding flow
127127
[FloatingButton](https://github.com/exyte/FloatingButton) - Floating button menu
128128
[ActivityIndicatorView](https://github.com/exyte/ActivityIndicatorView) - A number of animated loading indicators

SVGView.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
TVOS_DEPLOYMENT_TARGET = 14.0;
746746
VERSIONING_SYSTEM = "apple-generic";
747747
VERSION_INFO_PREFIX = "";
748-
WATCHOS_DEPLOYMENT_TARGET = 6.0;
748+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
749749
};
750750
name = Debug;
751751
};
@@ -805,7 +805,7 @@
805805
TVOS_DEPLOYMENT_TARGET = 14.0;
806806
VERSIONING_SYSTEM = "apple-generic";
807807
VERSION_INFO_PREFIX = "";
808-
WATCHOS_DEPLOYMENT_TARGET = 6.0;
808+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
809809
};
810810
name = Release;
811811
};

0 commit comments

Comments
 (0)