Fix Logger namespace collision on Xcode 12 and above (#1579)
* Fix Logger namespace collision on Xcode 12 and above * Add Xcode 12 unit test job
This commit is contained in:
parent
113f352d07
commit
6b1aed4777
|
@ -26,7 +26,7 @@ jobs:
|
||||||
runs-on: macOS-latest
|
runs-on: macOS-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode: ['11.3.1', '11.5']
|
xcode: ["11.3.1", "11.5", "12_beta"]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- name: Select Xcode
|
- name: Select Xcode
|
||||||
|
@ -41,7 +41,7 @@ jobs:
|
||||||
runs-on: macOS-latest
|
runs-on: macOS-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode: ['11.3.1', '11.4']
|
xcode: ["11.3.1", "11.4"]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- name: Select Xcode
|
- name: Select Xcode
|
||||||
|
@ -55,21 +55,21 @@ jobs:
|
||||||
runs-on: macOS-latest
|
runs-on: macOS-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode: ['11.5']
|
xcode: ["11.5"]
|
||||||
feature:
|
feature:
|
||||||
[
|
[
|
||||||
'generate-1',
|
"generate-1",
|
||||||
'generate-2',
|
"generate-2",
|
||||||
'generate-3',
|
"generate-3",
|
||||||
'generate-4',
|
"generate-4",
|
||||||
'generate-5',
|
"generate-5",
|
||||||
'generate-6',
|
"generate-6",
|
||||||
'init',
|
"init",
|
||||||
'lint',
|
"lint",
|
||||||
'scaffold',
|
"scaffold",
|
||||||
'up',
|
"up",
|
||||||
'build',
|
"build",
|
||||||
'cache',
|
"cache",
|
||||||
]
|
]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
|
@ -77,7 +77,7 @@ jobs:
|
||||||
run: sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
|
run: sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
|
||||||
- uses: actions/setup-ruby@v1
|
- uses: actions/setup-ruby@v1
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.x'
|
ruby-version: "2.x"
|
||||||
- name: Install Bundler 2.0.2
|
- name: Install Bundler 2.0.2
|
||||||
run: gem install bundler --version 2.0.2
|
run: gem install bundler --version 2.0.2
|
||||||
- name: Install Bundler dependencies
|
- name: Install Bundler dependencies
|
||||||
|
@ -94,7 +94,7 @@ jobs:
|
||||||
run: sudo xcode-select -switch /Applications/Xcode_11.5.app
|
run: sudo xcode-select -switch /Applications/Xcode_11.5.app
|
||||||
- uses: actions/setup-ruby@v1
|
- uses: actions/setup-ruby@v1
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.x'
|
ruby-version: "2.x"
|
||||||
- name: Install Bundler 2.0.2
|
- name: Install Bundler 2.0.2
|
||||||
run: gem install bundler --version 2.0.2
|
run: gem install bundler --version 2.0.2
|
||||||
- name: Install Bundler dependencies
|
- name: Install Bundler dependencies
|
||||||
|
|
|
@ -66,6 +66,7 @@ playground.xcworkspace
|
||||||
# Packages/
|
# Packages/
|
||||||
# Package.pins
|
# Package.pins
|
||||||
.build/
|
.build/
|
||||||
|
.swiftpm
|
||||||
|
|
||||||
# CocoaPods - Refactored to standalone file
|
# CocoaPods - Refactored to standalone file
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,12 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/
|
||||||
- Synthesized accessors for framework targets not resolving the path [#1575](https://github.com/tuist/tuist/pull/1575) by [@pepibumur](https://github.com/pepibumur).
|
- Synthesized accessors for framework targets not resolving the path [#1575](https://github.com/tuist/tuist/pull/1575) by [@pepibumur](https://github.com/pepibumur).
|
||||||
- Read coredata version from /.xccurrentversion file [#1572](https://github.com/tuist/tuist/pull/1572) by [@matiasvillaverde](https://github.com/matiasvillaverde).
|
- Read coredata version from /.xccurrentversion file [#1572](https://github.com/tuist/tuist/pull/1572) by [@matiasvillaverde](https://github.com/matiasvillaverde).
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Support for `--cache` to the `tuist generate` command [#1576](https://github.com/tuist/tuist/pull/1576) by [@pepibumur](https://github.com/pepibumur).
|
- Support for `--cache` to the `tuist generate` command [#1576](https://github.com/tuist/tuist/pull/1576) by [@pepibumur](https://github.com/pepibumur).
|
||||||
- Included that importing target name in the duplicate dependency warning message [#1573](https://github.com/tuist/tuist/pull/1573) by[ @thedavidharris](https://github.com/thedavidharris)
|
- Included that importing target name in the duplicate dependency warning message [#1573](https://github.com/tuist/tuist/pull/1573) by[ @thedavidharris](https://github.com/thedavidharris)
|
||||||
|
- Support to build and run the project on Xcode 12 by fixing namespace collisions on Logger [#1579](https://github.com/tuist/tuist/pull/1579) by[ @thedavidharris](https://github.com/thedavidharris)
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ let package = Package(
|
||||||
),
|
),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "TuistAutomationTests",
|
name: "TuistAutomationTests",
|
||||||
dependencies: ["TuistAutomation", "TuistSupportTesting", "TuistCoreTesting"]
|
dependencies: ["TuistAutomation", "TuistSupportTesting", "TuistCoreTesting", "RxBlocking"]
|
||||||
),
|
),
|
||||||
.target(
|
.target(
|
||||||
name: "TuistAutomationTesting",
|
name: "TuistAutomationTesting",
|
||||||
|
@ -184,7 +184,7 @@ let package = Package(
|
||||||
),
|
),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "TuistAutomationIntegrationTests",
|
name: "TuistAutomationIntegrationTests",
|
||||||
dependencies: ["TuistAutomation", "TuistSupportTesting"]
|
dependencies: ["TuistAutomation", "TuistSupportTesting", "RxBlocking"]
|
||||||
),
|
),
|
||||||
.target(
|
.target(
|
||||||
name: "TuistInsights",
|
name: "TuistInsights",
|
||||||
|
@ -224,11 +224,11 @@ let package = Package(
|
||||||
),
|
),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "TuistLoaderTests",
|
name: "TuistLoaderTests",
|
||||||
dependencies: ["TuistLoader", "TuistSupportTesting", "TuistLoaderTesting", "TuistCoreTesting"]
|
dependencies: ["TuistLoader", "TuistSupportTesting", "TuistLoaderTesting", "TuistCoreTesting", "RxBlocking"]
|
||||||
),
|
),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "TuistLoaderIntegrationTests",
|
name: "TuistLoaderIntegrationTests",
|
||||||
dependencies: ["TuistLoader", "TuistSupportTesting", "ProjectDescription"]
|
dependencies: ["TuistLoader", "TuistSupportTesting", "ProjectDescription", "RxBlocking"]
|
||||||
),
|
),
|
||||||
.testTarget(
|
.testTarget(
|
||||||
name: "TuistIntegrationTests",
|
name: "TuistIntegrationTests",
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import Foundation
|
import Foundation
|
||||||
import Logging
|
import struct Logging.Logger
|
||||||
import os
|
import os
|
||||||
|
|
||||||
public struct OSLogHandler: LogHandler {
|
public struct OSLogHandler: LogHandler {
|
||||||
|
|
Loading…
Reference in New Issue