Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #243 from omnivore-app/chore/update-swift-five-six

Browse Source 
Update to Swift 5.6
This commit is contained in:
Satindar Dhillon
2022-03-16 07:53:37 -07:00
committed by GitHub
parent 27157006c1 e25e6dc6c2
commit 39b19da07f
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple/BuildTools/Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:5.5
// swift-tools-version:5.6
import PackageDescription
let package = Package(

28
apple/Omnivore.xcodeproj/project.pbxproj
View File

@ -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;
};

2
apple/OmnivoreKit/Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:5.5
// swift-tools-version:5.6
import PackageDescription

2
apple/scripts/format_and_lint.sh
View File

@ -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"