diff --git a/Package.swift b/Package.swift index cdbb054..b382db3 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.9 // // This source file is part of the Stanford Spezi open-source project @@ -15,14 +15,14 @@ let package = Package( name: "SpeziFHIR", defaultLocalization: "en", platforms: [ - .iOS(.v16) + .iOS(.v17) ], products: [ .library(name: "SpeziFHIR", targets: ["SpeziFHIR"]) ], dependencies: [ .package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.5.0")), - .package(url: "https://github.com/StanfordSpezi/Spezi", .upToNextMinor(from: "0.7.0")) + .package(url: "https://github.com/StanfordSpezi/Spezi", .upToNextMinor(from: "0.8.0")) ], targets: [ .target( diff --git a/README.md b/README.md index 2d88c73..53f346f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordSpezi%2FSpeziFHIR%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/StanfordSpezi/SpeziFHIR) [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FStanfordSpezi%2FSpeziFHIR%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/StanfordSpezi/SpeziFHIR) -The Spezi FHIR modules build a building block of FHIR-based mobile appications using Spezi. +The Spezi FHIR modules build a building block of FHIR-based mobile applications using Spezi. For more information, please refer to the [API documentation](https://swiftpackageindex.com/StanfordSpezi/SpeziFHIR/documentation). diff --git a/Tests/UITests/TestApp/TestApp.swift b/Tests/UITests/TestApp/TestApp.swift index 09ea8fa..f19934c 100644 --- a/Tests/UITests/TestApp/TestApp.swift +++ b/Tests/UITests/TestApp/TestApp.swift @@ -17,7 +17,7 @@ struct UITestsApp: App { var body: some Scene { WindowGroup { - Text("FHIR") + Text("Spezi FHIR") .spezi(appDelegate) } } diff --git a/Tests/UITests/TestAppUITests/FHIRMockDataStorageProviderTests.swift b/Tests/UITests/TestAppUITests/FHIRMockDataStorageProviderTests.swift index c187fa7..059a1b8 100644 --- a/Tests/UITests/TestAppUITests/FHIRMockDataStorageProviderTests.swift +++ b/Tests/UITests/TestAppUITests/FHIRMockDataStorageProviderTests.swift @@ -9,11 +9,11 @@ import XCTest -final class FHIRMockWebServiceTests: XCTestCase { - func testFHIRMockWebServiceTests() throws { +final class SpeziFHIRTests: XCTestCase { + func testSpeziFHIR() throws { let app = XCUIApplication() app.launch() - XCTAssert(app.staticTexts["FHIR"].waitForExistence(timeout: 2)) + XCTAssert(app.staticTexts["Spezi FHIR"].waitForExistence(timeout: 2)) } } diff --git a/Tests/UITests/UITests.xcodeproj/project.pbxproj b/Tests/UITests/UITests.xcodeproj/project.pbxproj index 2b17659..82a475a 100644 --- a/Tests/UITests/UITests.xcodeproj/project.pbxproj +++ b/Tests/UITests/UITests.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 2F36AD33299DB72400B1077C /* FHIRMockDataStorageProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F36AD32299DB72400B1077C /* FHIRMockDataStorageProviderTests.swift */; }; 2F6D139A28F5F386007C25D6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2F6D139928F5F386007C25D6 /* Assets.xcassets */; }; 2FA7382C290ADFAA007ACEB9 /* TestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA7382B290ADFAA007ACEB9 /* TestApp.swift */; }; - 2FD021DB299E0E2F00E5B91B /* Spezi in Frameworks */ = {isa = PBXBuildFile; productRef = 2FD021DA299E0E2F00E5B91B /* Spezi */; }; 2FD021DD299E0F2900E5B91B /* TestAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FD021DC299E0F2900E5B91B /* TestAppDelegate.swift */; }; 2FF6813F2A849F77002897C6 /* SpeziFHIR in Frameworks */ = {isa = PBXBuildFile; productRef = 2FF6813E2A849F77002897C6 /* SpeziFHIR */; }; /* End PBXBuildFile section */ @@ -41,7 +40,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2FD021DB299E0E2F00E5B91B /* Spezi in Frameworks */, 2FF6813F2A849F77002897C6 /* SpeziFHIR in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -119,7 +117,6 @@ ); name = TestApp; packageProductDependencies = ( - 2FD021DA299E0E2F00E5B91B /* Spezi */, 2FF6813E2A849F77002897C6 /* SpeziFHIR */, ); productName = Example; @@ -175,7 +172,6 @@ ); mainGroup = 2F6D138928F5F384007C25D6; packageReferences = ( - 2FD021D9299E0E2F00E5B91B /* XCRemoteSwiftPackageReference "Spezi" */, ); productRefGroup = 2F6D139328F5F384007C25D6 /* Products */; projectDirPath = ""; @@ -285,7 +281,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -340,7 +336,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -366,7 +362,6 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -400,7 +395,6 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -490,23 +484,7 @@ }; /* End XCConfigurationList section */ -/* Begin XCRemoteSwiftPackageReference section */ - 2FD021D9299E0E2F00E5B91B /* XCRemoteSwiftPackageReference "Spezi" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/Spezi.git"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 0.7.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ - 2FD021DA299E0E2F00E5B91B /* Spezi */ = { - isa = XCSwiftPackageProductDependency; - package = 2FD021D9299E0E2F00E5B91B /* XCRemoteSwiftPackageReference "Spezi" */; - productName = Spezi; - }; 2FF6813E2A849F77002897C6 /* SpeziFHIR */ = { isa = XCSwiftPackageProductDependency; productName = SpeziFHIR; diff --git a/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 076d5fe..91f855a 100644 --- a/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/UITests/UITests.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/StanfordSpezi/Spezi", "state" : { - "revision" : "9ad506d4d2e36eb7a0c1ff8cc6bb0ef9c972724c", - "version" : "0.7.1" + "revision" : "b82fb371ab7f0446846ae8aeb56ffac56377890a", + "version" : "0.8.0" + } + }, + { + "identity" : "spezifoundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/StanfordSpezi/SpeziFoundation", + "state" : { + "revision" : "683c66f922a4cfe0882c4a86a43854f613b48541", + "version" : "0.1.0" } }, { diff --git a/Tests/UITests/UITests.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme b/Tests/UITests/UITests.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme index 4c090ef..81bb5e9 100644 --- a/Tests/UITests/UITests.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme +++ b/Tests/UITests/UITests.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme @@ -6,20 +6,6 @@ parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> - - - - + + + +