Skip to content

Commit

Permalink
Merge branch 'release/3.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Sep 24, 2021
2 parents 0fb2c40 + 2c97b5d commit c4eb6fb
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Demo/Demo.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version information
MARKETING_VERSION = 3.1.1
MARKETING_VERSION = 3.2.0

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "4754703c12cb69f5265a37c252451672563c592a",
"version": "4.0.1"
"revision": "cfd2b130277502b1355863ac4a105fd9922be752",
"version": "5.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "4754703c12cb69f5265a37c252451672563c592a",
"version": "4.0.1"
"revision": "cfd2b130277502b1355863ac4a105fd9922be752",
"version": "5.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription

struct ProjectSettings {
static let marketingVersion: String = "3.1.1"
static let marketingVersion: String = "3.2.0"
}

let package = Package(
Expand All @@ -22,7 +22,7 @@ let package = Package(
dependencies: [
.package(name: "FXReachability", url: "https://github.com/SRGSSR/FXReachability.git", .exact("1.3.2-srg5")),
.package(name: "Mantle", url: "https://github.com/Mantle/Mantle.git", .upToNextMinor(from: "2.1.6")),
.package(name: "SRGAppearance", url: "https://github.com/SRGSSR/srgappearance-apple.git", .upToNextMinor(from: "4.0.0")),
.package(name: "SRGAppearance", url: "https://github.com/SRGSSR/srgappearance-apple.git", .upToNextMinor(from: "5.0.0")),
.package(name: "SRGNetwork", url: "https://github.com/SRGSSR/srgnetwork-apple.git", .upToNextMinor(from: "3.0.0")),
.package(name: "UICKeyChainStore", url: "https://github.com/kishikawakatsumi/UICKeyChainStore.git", .upToNextMinor(from: "2.2.1"))
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "4754703c12cb69f5265a37c252451672563c592a",
"version": "4.0.1"
"revision": "cfd2b130277502b1355863ac4a105fd9922be752",
"version": "5.0.0"
}
},
{
Expand Down

0 comments on commit c4eb6fb

Please sign in to comment.