aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-04-14 01:05:26 -0500
committerIván Ávalos <avalos@disroot.org>2022-04-14 01:05:26 -0500
commitbb1367934355433ecaf60da8a42a1e6124f6af46 (patch)
treeccee4d2d51efb3056ba0cf0fe19c5ef7c1f25d0b
parent3b8a8dd6c08dee2fabcfedf11cd9d3c3ee3f5d12 (diff)
parent355d846e1f024a6877de94e38cd14d12fc80478b (diff)
downloadetbsa-trackermap-mobile-bb1367934355433ecaf60da8a42a1e6124f6af46.tar.gz
etbsa-trackermap-mobile-bb1367934355433ecaf60da8a42a1e6124f6af46.tar.bz2
etbsa-trackermap-mobile-bb1367934355433ecaf60da8a42a1e6124f6af46.zip
Merge remote-tracking branch 'origin/main'
-rw-r--r--iosApp/iosApp.xcodeproj/project.pbxproj4
-rw-r--r--iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved27
2 files changed, 29 insertions, 2 deletions
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
index 5aee1be..211fc3e 100644
--- a/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -590,7 +590,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.1;
+ MARKETING_VERSION = 1.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
@@ -629,7 +629,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.1;
+ MARKETING_VERSION = 1.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 2adab5b..f925bad 100644
--- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -29,6 +29,24 @@
}
},
{
+ "package": "geos",
+ "repositoryURL": "https://github.com/GEOSwift/geos.git",
+ "state": {
+ "branch": null,
+ "revision": "dc3a1e798e7ebb3cee1b6b219af2b0783820ff60",
+ "version": "7.0.0"
+ }
+ },
+ {
+ "package": "GEOSwift",
+ "repositoryURL": "https://github.com/GEOSwift/GEOSwift",
+ "state": {
+ "branch": null,
+ "revision": "ab813f1acbd92986e8733356b73b3f6d4ddc08e0",
+ "version": "9.0.0"
+ }
+ },
+ {
"package": "GoogleAppMeasurement",
"repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
"state": {
@@ -110,6 +128,15 @@
}
},
{
+ "package": "SwiftTabler",
+ "repositoryURL": "https://github.com/openalloc/SwiftTabler",
+ "state": {
+ "branch": null,
+ "revision": "03d8c9f20d34142b0bb9a31f15b3e6d8c47b39c7",
+ "version": "0.6.4"
+ }
+ },
+ {
"package": "SwiftUIX",
"repositoryURL": "https://github.com/ivan-avalos/SwiftUIX",
"state": {