Skip to content

Commit 1f4e4b7

Browse files
committed
Merge branch 'release/v3.0.0'
2 parents 16fef7f + f34cf59 commit 1f4e4b7

File tree

3 files changed

+21
-32
lines changed

3 files changed

+21
-32
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ on: [push]
55
jobs:
66
tests:
77
name: Unit-Tests
8-
runs-on: macOS-latest
8+
runs-on: macos-10.15
99
steps:
10-
- uses: actions/checkout@v1
11-
- name: fastlane ios tests
12-
run: fastlane ios tests
10+
- name: Checkout repository
11+
uses: actions/checkout@v1
12+
- name: Force Xcode 12.2
13+
run: sudo xcode-select -switch /Applications/Xcode_12.2.app
14+
- name: fastlane ios tests
15+
run: fastlane ios tests
1316
compatibility:
1417
name: Compatibility-Tests
15-
runs-on: macOS-latest
18+
runs-on: macos-10.15
1619
steps:
17-
- uses: actions/checkout@v1
18-
- name: fastlane ios compatibilityTests
19-
run: fastlane ios compatibilityTests
20+
- name: Checkout repository
21+
uses: actions/checkout@v1
22+
- name: Force Xcode 12.2
23+
run: sudo xcode-select -switch /Applications/Xcode_12.2.app
24+
- name: fastlane ios compatibilityTests
25+
run: fastlane ios compatibilityTests

README.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<a href="https://developer.apple.com/swift/">
99
<img src="https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat" alt="Swift 5.0">
1010
</a>
11-
<a href="https://github.com/Carthage/Carthage">
12-
<img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage Compatible">
13-
</a>
1411
<a href="https://github.com/apple/swift-package-manager">
1512
<img src="https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg" alt="SPM">
1613
</a>
@@ -38,20 +35,6 @@ After the application has started you should see several log messages in your Xc
3835

3936
## Installation
4037

41-
### Carthage
42-
43-
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
44-
45-
To integrate LoggingKit into your Xcode project using Carthage, specify it in your `Cartfile`:
46-
47-
```
48-
github "alexanderwe/LoggingKit"
49-
```
50-
51-
Run `carthage update` to build the framework and drag the built `LoggingKit.framework` into your Xcode project.
52-
53-
On your application targets’ “Build Phases” settings tab, click the “+” icon and choose “New Run Script Phase” and add the Framework path as mentioned in [Carthage Getting started Step 4, 5 and 6](https://github.com/Carthage/Carthage/blob/master/README.md#if-youre-building-for-ios-tvos-or-watchos)
54-
5538
### Swift Package Manager
5639

5740
To integrate using Apple's [Swift Package Manager](https://swift.org/package-manager/), add the following as a dependency to your `Package.swift`:

fastlane/Fastfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ platform :ios do
7373
project: "LoggingKit.xcodeproj",
7474
scheme: "LoggingKit-iOS",
7575
clean: true,
76-
destination: "platform=iOS Simulator,name=iPhone 11,OS=13.5"
76+
destination: "platform=iOS Simulator,name=iPhone 11,OS=14.2"
7777
)
7878
# Perform tvOS Tests
7979
scan(
8080
project: "LoggingKit.xcodeproj",
8181
scheme: "LoggingKit-tvOS",
8282
clean: true,
83-
destination: "platform=tvOS Simulator,name=Apple TV,OS=13.4"
83+
destination: "platform=tvOS Simulator,name=Apple TV,OS=14.2"
8484
)
8585
# Perform macOS Tests
8686
scan(
@@ -94,11 +94,11 @@ platform :ios do
9494
desc "Run Dependency-Manager compatibility tests"
9595
lane :compatibilityTests do
9696
# Carthage build to ensure Carthage compatibility
97-
carthage(
98-
command: "build",
99-
no_skip_current: true,
100-
cache_builds: true
101-
)
97+
# carthage(
98+
# command: "build",
99+
# no_skip_current: true,
100+
# cache_builds: true
101+
#)
102102
# Pod lib lint to ensure CocoaPods compatibility
103103
# pod_lib_lint(allow_warnings: true)
104104
# SPM Build to ensure Swift Package Manager compatibility

0 commit comments

Comments
 (0)