diff --git a/HostApp/HostApp.xcodeproj/project.pbxproj b/HostApp/HostApp.xcodeproj/project.pbxproj index cdc41f8..923ef22 100644 --- a/HostApp/HostApp.xcodeproj/project.pbxproj +++ b/HostApp/HostApp.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 9055BE02274828E100D7E80B /* amplifyconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = 9055BE00274828E000D7E80B /* amplifyconfiguration.json */; }; + 9055BE03274828E100D7E80B /* awsconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = 9055BE01274828E100D7E80B /* awsconfiguration.json */; }; 90608223272886D600662A60 /* HostAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90608222272886D600662A60 /* HostAppApp.swift */; }; 90608227272886D900662A60 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 90608226272886D900662A60 /* Assets.xcassets */; }; 9060822A272886D900662A60 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 90608229272886D900662A60 /* Preview Assets.xcassets */; }; @@ -15,8 +17,6 @@ 90608240272886D900662A60 /* HostAppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9060823F272886D900662A60 /* HostAppUITestsLaunchTests.swift */; }; 90A8E08B273AECE4008D83DE /* AmplifyMapLibreAdapter in Frameworks */ = {isa = PBXBuildFile; productRef = 90A8E08A273AECE4008D83DE /* AmplifyMapLibreAdapter */; }; 90A8E08D273AECE4008D83DE /* AmplifyMapLibreUI in Frameworks */ = {isa = PBXBuildFile; productRef = 90A8E08C273AECE4008D83DE /* AmplifyMapLibreUI */; }; - 90E379F82746BC67006FC938 /* amplifyconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = 90E379F62746BC67006FC938 /* amplifyconfiguration.json */; }; - 90E379F92746BC67006FC938 /* awsconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = 90E379F72746BC67006FC938 /* awsconfiguration.json */; }; 90E37A002746E6B2006FC938 /* AMLMapView_ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E379FC2746E6B2006FC938 /* AMLMapView_ViewModel.swift */; }; 90E37A012746E6B2006FC938 /* SimpleAMLMapView_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E379FD2746E6B2006FC938 /* SimpleAMLMapView_View.swift */; }; 90E37A022746E6B2006FC938 /* AMLMapView_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E379FE2746E6B2006FC938 /* AMLMapView_View.swift */; }; @@ -41,6 +41,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 9055BE00274828E000D7E80B /* amplifyconfiguration.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = amplifyconfiguration.json; sourceTree = ""; }; + 9055BE01274828E100D7E80B /* awsconfiguration.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = awsconfiguration.json; sourceTree = ""; }; 90589ADE2746EAE30054AF83 /* amplify-ios-maplibre */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "amplify-ios-maplibre"; path = ..; sourceTree = ""; }; 9060821F272886D600662A60 /* HostApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HostApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 90608222272886D600662A60 /* HostAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostAppApp.swift; sourceTree = ""; }; @@ -51,8 +53,6 @@ 90608239272886D900662A60 /* HostAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HostAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 9060823D272886D900662A60 /* HostAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostAppUITests.swift; sourceTree = ""; }; 9060823F272886D900662A60 /* HostAppUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostAppUITestsLaunchTests.swift; sourceTree = ""; }; - 90E379F62746BC67006FC938 /* amplifyconfiguration.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = amplifyconfiguration.json; sourceTree = ""; }; - 90E379F72746BC67006FC938 /* awsconfiguration.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = awsconfiguration.json; sourceTree = ""; }; 90E379FC2746E6B2006FC938 /* AMLMapView_ViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AMLMapView_ViewModel.swift; sourceTree = ""; }; 90E379FD2746E6B2006FC938 /* SimpleAMLMapView_View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleAMLMapView_View.swift; sourceTree = ""; }; 90E379FE2746E6B2006FC938 /* AMLMapView_View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AMLMapView_View.swift; sourceTree = ""; }; @@ -170,8 +170,8 @@ 90E78C6C2729BB7D0061DF48 /* Configuration */ = { isa = PBXGroup; children = ( - 90E379F62746BC67006FC938 /* amplifyconfiguration.json */, - 90E379F72746BC67006FC938 /* awsconfiguration.json */, + 9055BE00274828E000D7E80B /* amplifyconfiguration.json */, + 9055BE01274828E100D7E80B /* awsconfiguration.json */, ); path = Configuration; sourceTree = ""; @@ -285,9 +285,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 90E379F92746BC67006FC938 /* awsconfiguration.json in Resources */, 9060822A272886D900662A60 /* Preview Assets.xcassets in Resources */, - 90E379F82746BC67006FC938 /* amplifyconfiguration.json in Resources */, + 9055BE03274828E100D7E80B /* awsconfiguration.json in Resources */, + 9055BE02274828E100D7E80B /* amplifyconfiguration.json in Resources */, 90608227272886D900662A60 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/HostApp/HostApp/Views/SimpleAMLMapView_View.swift b/HostApp/HostApp/Views/SimpleAMLMapView_View.swift index 0607268..1f6ebc6 100644 --- a/HostApp/HostApp/Views/SimpleAMLMapView_View.swift +++ b/HostApp/HostApp/Views/SimpleAMLMapView_View.swift @@ -27,6 +27,7 @@ struct SimpleAMLMapView_View: View { } } +// swiftlint:disable:next type_name struct SimpleAMLMapView_View_Previews: PreviewProvider { static var previews: some View { SimpleAMLMapView_View() diff --git a/Package.resolved b/Package.resolved index 052d8c7..22b8f3b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,9 +5,9 @@ "package": "Amplify", "repositoryURL": "https://github.com/aws-amplify/amplify-ios", "state": { - "branch": "main", - "revision": "9a30a190f09a9d4d35ad19d3925e7c2ecb493132", - "version": null + "branch": null, + "revision": "598a3f62da6eb0c23167a494d74a50c2f80372f3", + "version": "1.16.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/aws-amplify/aws-sdk-ios-spm.git", "state": { "branch": null, - "revision": "c2a17883d70e26af054de7da73a5b5043a87af3a", - "version": "2.26.1" + "revision": "75abac6f2cedda11b2d4f42971c88ab1288431c5", + "version": "2.26.5" } }, { diff --git a/Package.swift b/Package.swift index b64e2d4..7a5feed 100644 --- a/Package.swift +++ b/Package.swift @@ -3,16 +3,6 @@ import PackageDescription -enum Amplify { - static let packageName = "Amplify" - static let packageURL = "https://github.com/aws-amplify/amplify-ios" - static let requirement: Package.Dependency.Requirement = .branch("main") - static let package: Package.Dependency = .package( - name: Amplify.packageName, - url: Amplify.packageURL, - Amplify.requirement - ) -} // Package let package = Package( name: "AmplifyMapLibreAdapter", @@ -31,9 +21,9 @@ let package = Package( dependencies: [ // Amplify .package( - name: Amplify.packageName, - url: Amplify.packageURL, - Amplify.requirement + name: "Amplify", + url: "https://github.com/aws-amplify/amplify-ios", + .upToNextMajor(from: "1.16.1") ), // MapLibre @@ -47,10 +37,10 @@ let package = Package( .target( name: "AmplifyMapLibreAdapter", dependencies: [ - .product(name: "Amplify", package: Amplify.packageName), - .product(name: "AWSCognitoAuthPlugin", package: Amplify.packageName), - .product(name: "AWSLocationGeoPlugin", package: Amplify.packageName), - .product(name: "AWSPluginsCore", package: Amplify.packageName), + .product(name: "Amplify", package: "Amplify"), + .product(name: "AWSCognitoAuthPlugin", package: "Amplify"), + .product(name: "AWSLocationGeoPlugin", package: "Amplify"), + .product(name: "AWSPluginsCore", package: "Amplify"), .product(name: "Mapbox", package: "MapLibre GL Native") ] ),