Skip to content

Commit

Permalink
Merge branch 'release/v3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderwe committed Nov 23, 2020
2 parents 16fef7f + f34cf59 commit 1f4e4b7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 32 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@ on: [push]
jobs:
tests:
name: Unit-Tests
runs-on: macOS-latest
runs-on: macos-10.15
steps:
- uses: actions/checkout@v1
- name: fastlane ios tests
run: fastlane ios tests
- name: Checkout repository
uses: actions/checkout@v1
- name: Force Xcode 12.2
run: sudo xcode-select -switch /Applications/Xcode_12.2.app
- name: fastlane ios tests
run: fastlane ios tests
compatibility:
name: Compatibility-Tests
runs-on: macOS-latest
runs-on: macos-10.15
steps:
- uses: actions/checkout@v1
- name: fastlane ios compatibilityTests
run: fastlane ios compatibilityTests
- name: Checkout repository
uses: actions/checkout@v1
- name: Force Xcode 12.2
run: sudo xcode-select -switch /Applications/Xcode_12.2.app
- name: fastlane ios compatibilityTests
run: fastlane ios compatibilityTests
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<a href="https://developer.apple.com/swift/">
<img src="https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat" alt="Swift 5.0">
</a>
<a href="https://github.com/Carthage/Carthage">
<img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage Compatible">
</a>
<a href="https://github.com/apple/swift-package-manager">
<img src="https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg" alt="SPM">
</a>
Expand Down Expand Up @@ -38,20 +35,6 @@ After the application has started you should see several log messages in your Xc

## Installation

### Carthage

[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.

To integrate LoggingKit into your Xcode project using Carthage, specify it in your `Cartfile`:

```
github "alexanderwe/LoggingKit"
```

Run `carthage update` to build the framework and drag the built `LoggingKit.framework` into your Xcode project.

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)

### Swift Package Manager

To integrate using Apple's [Swift Package Manager](https://swift.org/package-manager/), add the following as a dependency to your `Package.swift`:
Expand Down
14 changes: 7 additions & 7 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ platform :ios do
project: "LoggingKit.xcodeproj",
scheme: "LoggingKit-iOS",
clean: true,
destination: "platform=iOS Simulator,name=iPhone 11,OS=13.5"
destination: "platform=iOS Simulator,name=iPhone 11,OS=14.2"
)
# Perform tvOS Tests
scan(
project: "LoggingKit.xcodeproj",
scheme: "LoggingKit-tvOS",
clean: true,
destination: "platform=tvOS Simulator,name=Apple TV,OS=13.4"
destination: "platform=tvOS Simulator,name=Apple TV,OS=14.2"
)
# Perform macOS Tests
scan(
Expand All @@ -94,11 +94,11 @@ platform :ios do
desc "Run Dependency-Manager compatibility tests"
lane :compatibilityTests do
# Carthage build to ensure Carthage compatibility
carthage(
command: "build",
no_skip_current: true,
cache_builds: true
)
# carthage(
# command: "build",
# no_skip_current: true,
# cache_builds: true
#)
# Pod lib lint to ensure CocoaPods compatibility
# pod_lib_lint(allow_warnings: true)
# SPM Build to ensure Swift Package Manager compatibility
Expand Down

0 comments on commit 1f4e4b7

Please sign in to comment.