Skip to content

Commit

Permalink
Fix compilation issues.
Browse files Browse the repository at this point in the history
Bumped minimum swift version to 5.7.
Still looking at what's causing the tests to fail like they are.
  • Loading branch information
younata committed Nov 1, 2022
1 parent fcf8cc8 commit 884ab84
Show file tree
Hide file tree
Showing 68 changed files with 2,945 additions and 1,663 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on: [push, pull_request]
jobs:
test:
name: Build and Test Nimble-Snapshots
runs-on: macOS-11
runs-on: macOS-12
steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Setup Xcode version
uses: maxim-lobanov/[email protected]
with:
xcode-version: 13.0
xcode-version: 14.0

- name: Set up Ruby 2.7.2
uses: ruby/[email protected]
Expand All @@ -34,10 +34,7 @@ jobs:
- name: "Create output dir"
run: mkdir output

- name: Run tests in Swift 4.2
run: xcodebuild -workspace 'Bootstrap/Bootstrap.xcworkspace' -sdk 'iphonesimulator' -scheme 'Bootstrap' -destination 'name=iPhone 8' SWIFT_VERSION=4.2 build test | tee output/xcodebuild_swift4.2.log

- name: Run tests in Swift 5.0
- name: Run tests in Swift 5.X
run: xcodebuild -workspace 'Bootstrap/Bootstrap.xcworkspace' -sdk 'iphonesimulator' -scheme 'Bootstrap' -destination 'name=iPhone 8' SWIFT_VERSION=5.0 build test | tee output/xcodebuild_swift5.0.log

- name: Run Carthage integration test
Expand Down
4 changes: 2 additions & 2 deletions Bootstrap/Bootstrap.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -500,7 +500,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
1 change: 1 addition & 0 deletions Bootstrap/BootstrapTests/BootstrapTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Nimble_Snapshots
import Quick
import UIKit

@MainActor
final class BootstrapTests: QuickSpec {

override func spec() {
Expand Down
1 change: 1 addition & 0 deletions Bootstrap/BootstrapTests/DynamicSizeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import UIKit

@testable import Bootstrap

@MainActor
final class DynamicSizeTests: QuickSpec {

override func spec() {
Expand Down
1 change: 1 addition & 0 deletions Bootstrap/BootstrapTests/DynamicTypeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import UIKit

@testable import Bootstrap

@MainActor
final class DynamicTypeTests: QuickSpec {

override func spec() {
Expand Down
4 changes: 2 additions & 2 deletions Bootstrap/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '11.0'
platform :ios, '13.0'

target 'Bootstrap' do

Expand All @@ -12,4 +12,4 @@ target 'Bootstrap' do
pod 'Quick'
end

end
end
16 changes: 8 additions & 8 deletions Bootstrap/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ PODS:
- iOSSnapshotTestCase/Core (8.0.0)
- iOSSnapshotTestCase/SwiftSupport (8.0.0):
- iOSSnapshotTestCase/Core
- Nimble (10.0.0)
- Nimble (11.0.0)
- Nimble-Snapshots (9.4.0):
- Nimble-Snapshots/Core (= 9.4.0)
- Nimble-Snapshots/Core (9.4.0):
- iOSSnapshotTestCase (~> 8.0)
- Nimble
- Quick (5.0.1)
- Nimble (~> 11.0)
- Quick (6.0.0)

DEPENDENCIES:
- Forgeries
Expand All @@ -34,10 +34,10 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250
iOSSnapshotTestCase: a670511f9ee3829c2b9c23e6e68f315fd7b6790f
Nimble: 5316ef81a170ce87baf72dd961f22f89a602ff84
Nimble-Snapshots: ef281b908c604f78c8313587e25ea92c8ab513d7
Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179
Nimble: a854c12888a21d9e25a0413bb743ad76c37ef50c
Nimble-Snapshots: 9f29ff080d7aeceedd1c9b929cdb690e0a86439a
Quick: 4d5ab9e81f0a632cbf9bc4f3069b55e5eeb175df

PODFILE CHECKSUM: c3171133ba8d8bc9cf4cdaa6946313041b273157
PODFILE CHECKSUM: cd5b709b72116303d001ccd6a46fecaf6ce2c21b

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
6 changes: 3 additions & 3 deletions Bootstrap/Pods/Local Podspecs/Nimble-Snapshots.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Bootstrap/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 26 additions & 2 deletions Bootstrap/Pods/Nimble/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 884ab84

Please sign in to comment.