Skip to content

Commit b3fc795

Browse files
committed
✨ Add new views and update dependencies
1 parent afccf0b commit b3fc795

File tree

320 files changed

+1800
-1300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+1800
-1300
lines changed

.swiftpm/xcode/xcshareddata/xcschemes/AllMonkiProjectsViews.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/CommonTests.xcscheme

-52
This file was deleted.

.swiftpm/xcode/xcshareddata/xcschemes/MonkiMapViews.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/MonkiProjectsViews.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/monki-projects-views-Package.xcscheme

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -146,16 +146,6 @@
146146
ReferencedContainer = "container:">
147147
</BuildableReference>
148148
</TestableReference>
149-
<TestableReference
150-
skipped = "NO">
151-
<BuildableReference
152-
BuildableIdentifier = "primary"
153-
BlueprintIdentifier = "MonkiMapViewsTests"
154-
BuildableName = "MonkiMapViewsTests"
155-
BlueprintName = "MonkiMapViewsTests"
156-
ReferencedContainer = "container:">
157-
</BuildableReference>
158-
</TestableReference>
159149
</Testables>
160150
</TestAction>
161151
<LaunchAction

Package.resolved

+37-10
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
"repositoryURL": "https://github.com/lukaskubanek/LoremSwiftum",
1616
"state": {
1717
"branch": null,
18-
"revision": "eef89bf8b9937462f9c493789609897763b383e2",
19-
"version": "2.2.1"
18+
"revision": "8942e732e50458cde5dccf9996afa16f29372853",
19+
"version": "2.2.2"
2020
}
2121
},
2222
{
23-
"package": "monki-projects-model-swift",
24-
"repositoryURL": "https://github.com/MonkiProjects/monki-projects-model-swift",
23+
"package": "monki-projects-dto",
24+
"repositoryURL": "https://github.com/MonkiProjects/monki-projects-dto-swift",
2525
"state": {
26-
"branch": null,
27-
"revision": "8b4cc80f99f2974580c04e2f585622d032c51a75",
28-
"version": "0.5.3"
26+
"branch": "0.9.0-dto",
27+
"revision": "18a4b52d769e32adedcf8890aeb77c8966c31da4",
28+
"version": null
2929
}
3030
},
3131
{
@@ -38,12 +38,39 @@
3838
}
3939
},
4040
{
41-
"package": "swift-prefixed-type",
41+
"package": "swift-algorithms",
42+
"repositoryURL": "https://github.com/apple/swift-algorithms",
43+
"state": {
44+
"branch": null,
45+
"revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e",
46+
"version": "1.0.0"
47+
}
48+
},
49+
{
50+
"package": "swift-log",
51+
"repositoryURL": "https://github.com/apple/swift-log.git",
52+
"state": {
53+
"branch": null,
54+
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
55+
"version": "1.4.2"
56+
}
57+
},
58+
{
59+
"package": "swift-numerics",
60+
"repositoryURL": "https://github.com/apple/swift-numerics",
61+
"state": {
62+
"branch": null,
63+
"revision": "0a5bc04095a675662cf24757cc0640aa2204253b",
64+
"version": "1.0.2"
65+
}
66+
},
67+
{
68+
"package": "prefixed",
4269
"repositoryURL": "https://github.com/RemiBardon/swift-prefixed-type",
4370
"state": {
4471
"branch": null,
45-
"revision": "f063f75e7bc69a96e74e8e43334859a7390ddeb7",
46-
"version": "2.0.0"
72+
"revision": "18a0bef18e06a9e356d4a50c1914824f904f96d2",
73+
"version": "2.0.2"
4774
}
4875
},
4976
{

Package.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.5
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -7,8 +7,7 @@ let package = Package(
77
name: "monki-projects-views",
88
defaultLocalization: "en",
99
platforms: [
10-
.iOS(.v14),
11-
.macOS(.v11)
10+
.iOS(.v15),
1211
],
1312
products: [
1413
.library(
@@ -26,9 +25,10 @@ let package = Package(
2625
],
2726
dependencies: [
2827
.package(
29-
name: "monki-projects-model",
30-
url: "https://github.com/MonkiProjects/monki-projects-model-swift",
31-
.upToNextMinor(from: "0.5.0")
28+
name: "monki-projects-dto",
29+
url: "https://github.com/MonkiProjects/monki-projects-dto-swift",
30+
//.upToNextMinor(from: "0.9.0")
31+
.branch("0.9.0-dto")
3232
),
3333
.package(url: "https://github.com/kean/FetchImage", .upToNextMinor(from: "0.3.0")),
3434
.package(url: "https://github.com/BubiDevs/SwiftFlags", .upToNextMajor(from: "1.2.0")),
@@ -53,7 +53,7 @@ let package = Package(
5353
name: "MonkiProjectsViews",
5454
dependencies: [
5555
.target(name: "Common"),
56-
.product(name: "MonkiProjectsModel", package: "monki-projects-model"),
56+
.product(name: "MonkiProjectsDTO", package: "monki-projects-dto"),
5757
],
5858
resources: [
5959
.process("Users/Resources"),
@@ -69,7 +69,7 @@ let package = Package(
6969
name: "MonkiMapViews",
7070
dependencies: [
7171
.target(name: "MonkiProjectsViews"),
72-
.product(name: "MonkiMapModel", package: "monki-projects-model"),
72+
.product(name: "MonkiMapDTO", package: "monki-projects-dto"),
7373
],
7474
resources: [
7575
.process("Places/Resources"),

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# monki-projects-ios-views
1+
# monki-projects-views
22

3-
Atom & molecule views used in the iOS Monki Map app.
3+
Atom & molecule views used in the Monki Map app.

Sources/MonkiMapViews/Places/Helpers/Categories/PlaceCategory+Color.swift

-47
This file was deleted.

Sources/MonkiMapViews/Places/Helpers/Categories/PlaceCategory+Icon.swift

-31
This file was deleted.

Sources/MonkiMapViews/Places/Helpers/Kinds/PlaceKind+Color.swift

-43
This file was deleted.

0 commit comments

Comments
 (0)