Skip to content

Swift Package Manager and Release Builds Fix #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulsolt-ofsw merged 1 commit into from
Jun 18, 2025
Merged

Swift Package Manager and Release Builds Fix #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 164 additions & 42 deletions MAGE.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion MAGE.xcodeproj/xcshareddata/xcschemes/MAGE.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
138 changes: 136 additions & 2 deletions MAGE.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion MAGEGeoPackageTests/Map/GeoPackage/GeoPackageImporterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
import OHHTTPStubs
import Nimble
import geopackage_ios
import GeoPackage
import OSLog

@testable import MAGE
Expand Down
2 changes: 1 addition & 1 deletion MAGEGeoPackageTests/Map/GeoPackage/GeoPackageImporterUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import XCTest
import Nimble
import Quick
import geopackage_ios
import GeoPackage
import OHHTTPStubs

@testable import MAGE
Expand Down
2 changes: 1 addition & 1 deletion MAGEGeoPackageTests/Map/GeoPackage/GeoPackageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import XCTest
import OHHTTPStubs
import geopackage_ios
import GeoPackage
import OSLog

@testable import MAGE
Expand Down
3 changes: 1 addition & 2 deletions MAGEGeoPackageTests/TestingAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
#import <Foundation/Foundation.h>
#import "TestingAppDelegate.h"
#import "MagicalRecord+MAGE.h"
#import "GPKGGeoPackageManager.h"
#import "GPKGGeoPackageFactory.h"
@import GeoPackage;
#import "MAGE-Swift.h"

@interface TestingAppDelegate ()
Expand Down
2 changes: 1 addition & 1 deletion Mage/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#import <AFNetworking/AFNetworkActivityIndicatorManager.h>
#import "MageSessionManager.h"
#import "MagicalRecord+MAGE.h"
#import "GPKGGeoPackageFactory.h"
@import GeoPackage;
#import "MageConstants.h"
#import "MageOfflineObservationManager.h"
#import "MageAppCoordinator.h"
Expand Down
2 changes: 1 addition & 1 deletion Mage/BaseMapOverlay.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Foundation
import MapFramework
import geopackage_ios
import GeoPackage

@objc class BaseMapOverlay: GPKGFeatureOverlay, OverlayRenderable {
var renderer: MKOverlayRenderer {
Expand Down
4 changes: 2 additions & 2 deletions Mage/CoordinateDisplayType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import Foundation
import MapKit
import gars_ios
import mgrs_ios
import GARS
import MGRS
import CLLocationCoordinate2DExtensions

enum CoordinateDisplayType: Int, CustomStringConvertible {
Expand Down
2 changes: 1 addition & 1 deletion Mage/CoreData/GPSLocation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import CoreData
import UIKit
import CoreTelephony
import AFNetworking
import sf_ios
import SimpleFeatures

@objc public class GPSLocation: NSManagedObject {

Expand Down
2 changes: 1 addition & 1 deletion Mage/CoreData/Location.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import Foundation
import CoreData
import CoreLocation
import sf_ios
import SimpleFeatures
import MagicalRecord

@objc public class Location: NSManagedObject, Navigable {
Expand Down
4 changes: 2 additions & 2 deletions Mage/CoreData/Observation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import Foundation
import CoreData
import sf_ios
import SimpleFeatures
import UIKit
import MagicalRecord
import geopackage_ios
import GeoPackage

enum ObservationState: Int, CustomStringConvertible {
case Archive, Active
Expand Down
4 changes: 2 additions & 2 deletions Mage/Extensions/MKShapeExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import Foundation
import MapKit
import sf_wkt_ios
import SimpleFeaturesWKT
import MapFramework
import geopackage_ios
import GeoPackage

extension MKShape {
static func fromWKT(wkt: String, distance: Double?) -> MKShape? {
Expand Down
25 changes: 0 additions & 25 deletions Mage/GeoPackage/GeoPackage.h
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions Mage/GeoPackage/GeoPackage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import Foundation
import ExceptionCatcher
import geopackage_ios
import sf_ios
import sf_proj_ios
import GeoPackage
import SimpleFeatures
import SimpleFeaturesProjections

@objc actor GeoPackage: NSObject {

Expand Down Expand Up @@ -323,7 +323,7 @@ import sf_proj_ios
if featureTableCacheOverlay.indexed {
let featureTiles = GPKGFeatureTiles(geoPackage: geoPackage, andFeatureDao: featureDao)
var maxFeaturesPerTile = UserDefaults.standard.geoPackageFeatureTilesMaxFeaturesPerTile
if featureDao.geometryType() == SF_POINT {
if featureDao.geometryType() == .POINT {
maxFeaturesPerTile = UserDefaults.standard.geoPackageFeatureTilesMaxPointsPerTile
}
featureTiles?.maxFeaturesPerTile = NSNumber(value: maxFeaturesPerTile)
Expand Down Expand Up @@ -354,7 +354,7 @@ import sf_proj_ios
} else {
// Not indexed, add the features to the map
var maxFeaturesPerTable = UserDefaults.standard.geoPackageFeaturesMaxFeaturesPerTable
if featureDao.geometryType() == SF_POINT {
if featureDao.geometryType() == .POINT {
maxFeaturesPerTable = UserDefaults.standard.geoPackageFeaturesMaxPointsPerTable
}
if let projection = featureDao.projection,
Expand Down
2 changes: 1 addition & 1 deletion Mage/GeoPackage/GeoPackageImporter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import geopackage_ios
import GeoPackage
import ExceptionCatcher
import SSZipArchive

Expand Down
4 changes: 2 additions & 2 deletions Mage/Geocoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import Foundation

import gars_ios
import mgrs_ios
import GARS
import MGRS

enum SearchResponseType {
case mgrs
Expand Down
2 changes: 1 addition & 1 deletion Mage/GeometryEditCoordinator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>
#import <MaterialComponents/MaterialContainerScheme.h>
#import "SFGeometry.h"
@import SimpleFeatures;
#import <MapKit/MapKit.h>

@protocol GeometryEditDelegate
Expand Down
2 changes: 1 addition & 1 deletion Mage/GeometryEditCoordinator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "GeometryEditCoordinator.h"
#import "GeometryEditViewController.h"
#import "LocationService.h"
#import "SFPoint.h"
@import SimpleFeatures;
#import "MAGE-Swift.h"

@interface GeometryEditCoordinator() <SearchMapViewControllerDelegate>
Expand Down
2 changes: 1 addition & 1 deletion Mage/GeometryEditMapDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import "GeometryEditMapDelegate.h"
#import "GPKGMapPoint.h"
@import GeoPackage;
#import "MapShapePointAnnotationView.h"
#import "MAGE-Swift.h"

Expand Down
Loading