diff --git a/apple/BuildTools/Package.swift b/apple/BuildTools/Package.swift index 63cd75aac..e07580557 100644 --- a/apple/BuildTools/Package.swift +++ b/apple/BuildTools/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.6 import PackageDescription let package = Package( diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index 068f6b231..d27efe2d4 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -1164,7 +1164,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Omnivore.app/Contents/MacOS/Omnivore"; }; name = Debug; @@ -1189,7 +1189,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Omnivore.app/Contents/MacOS/Omnivore"; }; name = Release; @@ -1213,7 +1213,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = "Omnivore-iOS"; }; @@ -1237,7 +1237,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = "Omnivore-iOS"; }; @@ -1270,7 +1270,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Debug; }; @@ -1300,7 +1300,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Release; }; @@ -1324,7 +1324,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TEST_TARGET_NAME = Omnivore; }; name = Debug; @@ -1348,7 +1348,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TEST_TARGET_NAME = Omnivore; }; name = Release; @@ -1383,7 +1383,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Debug; }; @@ -1416,7 +1416,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Release; }; @@ -1510,7 +1510,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1548,7 +1548,7 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1587,7 +1587,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Debug; }; @@ -1624,7 +1624,7 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.6; }; name = Release; }; diff --git a/apple/OmnivoreKit/Package.swift b/apple/OmnivoreKit/Package.swift index 9ea66fc10..33eb916f0 100644 --- a/apple/OmnivoreKit/Package.swift +++ b/apple/OmnivoreKit/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.6 import PackageDescription diff --git a/apple/scripts/format_and_lint.sh b/apple/scripts/format_and_lint.sh index aac7f53d1..bedee3f15 100755 --- a/apple/scripts/format_and_lint.sh +++ b/apple/scripts/format_and_lint.sh @@ -1,5 +1,5 @@ cd BuildTools -SDKROOT=macosx +SDKROOT=(xcrun --sdk macosx --show-sdk-path) # swift package update #Uncomment this line temporarily to update the version used to the latest matching your BuildTools/Package.swift file swift run -c release swiftformat "$SRCROOT" swift run swiftlint --path "$SRCROOT" \ No newline at end of file