Skip to content

Commit 488a4cf

Browse files
Adapt to Xcode 14 (#2234)
* Adapt to Xcode 14 * Update macos version * Fix tests
1 parent b6e35ac commit 488a4cf

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88

99
jobs:
1010
iOS:
11-
runs-on: macOS-latest
11+
runs-on: macos-12
1212
strategy:
1313
matrix:
14-
destination: ['platform=iOS Simulator,OS=15.2,name=iPhone 11']
14+
destination: ['platform=iOS Simulator,OS=16.0,name=iPhone 14']
1515

1616
steps:
1717
- uses: actions/checkout@v2
1818
- uses: maxim-lobanov/setup-xcode@v1
1919
with:
20-
xcode-version: '13.2.1'
20+
xcode-version: '14.0.1'
2121
- name: Build and test
2222
run: set -o pipefail && xcodebuild -project Eureka.xcodeproj -scheme 'Eureka' -sdk 'iphonesimulator' -destination "${{ matrix.destination }}" -configuration Debug test | xcpretty

Eureka.xcodeproj/project.pbxproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@
439439
isa = PBXProject;
440440
attributes = {
441441
LastSwiftUpdateCheck = 0700;
442-
LastUpgradeCheck = 1300;
442+
LastUpgradeCheck = 1400;
443443
ORGANIZATIONNAME = Xmartlabs;
444444
TargetAttributes = {
445445
51729DEA1B9A4F5E004A00EB = {
@@ -649,7 +649,7 @@
649649
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
650650
GCC_WARN_UNUSED_FUNCTION = YES;
651651
GCC_WARN_UNUSED_VARIABLE = YES;
652-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
652+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
653653
MTL_ENABLE_DEBUG_INFO = YES;
654654
ONLY_ACTIVE_ARCH = YES;
655655
SDKROOT = iphoneos;
@@ -705,7 +705,7 @@
705705
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
706706
GCC_WARN_UNUSED_FUNCTION = YES;
707707
GCC_WARN_UNUSED_VARIABLE = YES;
708-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
708+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
709709
MTL_ENABLE_DEBUG_INFO = NO;
710710
SDKROOT = iphoneos;
711711
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -730,6 +730,7 @@
730730
ENABLE_BITCODE = YES;
731731
INFOPLIST_FILE = Source/Info.plist;
732732
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
733+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
733734
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
734735
MARKETING_VERSION = 5.4.0;
735736
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Eureka;
@@ -754,6 +755,7 @@
754755
ENABLE_BITCODE = YES;
755756
INFOPLIST_FILE = Source/Info.plist;
756757
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
758+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
757759
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
758760
MARKETING_VERSION = 5.4.0;
759761
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Eureka;

Eureka.xcodeproj/xcshareddata/xcschemes/Eureka.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example.xcodeproj/project.pbxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
51729E121B9A54F1004A00EB /* Project object */ = {
338338
isa = PBXProject;
339339
attributes = {
340-
LastUpgradeCheck = 1300;
340+
LastUpgradeCheck = 1400;
341341
ORGANIZATIONNAME = Xmartlabs;
342342
TargetAttributes = {
343343
51729E191B9A54F1004A00EB = {
@@ -563,7 +563,7 @@
563563
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
564564
GCC_WARN_UNUSED_FUNCTION = YES;
565565
GCC_WARN_UNUSED_VARIABLE = YES;
566-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
566+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
567567
MTL_ENABLE_DEBUG_INFO = YES;
568568
ONLY_ACTIVE_ARCH = YES;
569569
SDKROOT = iphoneos;
@@ -613,7 +613,7 @@
613613
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
614614
GCC_WARN_UNUSED_FUNCTION = YES;
615615
GCC_WARN_UNUSED_VARIABLE = YES;
616-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
616+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
617617
MTL_ENABLE_DEBUG_INFO = NO;
618618
SDKROOT = iphoneos;
619619
VALIDATE_PRODUCT = YES;
@@ -630,7 +630,7 @@
630630
CODE_SIGN_STYLE = Automatic;
631631
DEVELOPMENT_TEAM = "";
632632
INFOPLIST_FILE = Example/Example/Info.plist;
633-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
633+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
634634
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
635635
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
636636
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -651,7 +651,7 @@
651651
CODE_SIGN_STYLE = Automatic;
652652
DEVELOPMENT_TEAM = "";
653653
INFOPLIST_FILE = Example/Example/Info.plist;
654-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
654+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
655655
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
656656
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
657657
PRODUCT_NAME = "$(TARGET_NAME)";

Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/HelperMethodTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class HelperMethodTests: BaseEurekaTests {
4646
XCTAssertEqual(row6, form[0][6])
4747
XCTAssertEqual(row6, form.rowBy(tag: "IntRow_f1") as? IntRow)
4848

49-
let row_5_and_6: Slice<Section> = form[0][Range(5...6)]
49+
let row_5_and_6: ArraySlice<BaseRow> = form[0][5...6]
5050
XCTAssertEqual(row_5_and_6[5], form[0][5])
5151
XCTAssertEqual(row_5_and_6[6], form[0][6])
5252

0 commit comments

Comments
 (0)