From 2ae727f22dc46c4bb0e1c604be4ab48ddfbcbec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Wei=C3=9F?= Date: Mon, 23 Nov 2020 20:55:30 +0100 Subject: [PATCH 1/2] fix(ci): Fix Github Actions configuration --- .github/workflows/main.yml | 22 ++++++++++++++-------- fastlane/Fastfile | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2aa11af..3a48738 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6cc293c..a4588a2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -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( From f34cf599897c7e9a5efbc6a63d2c66ad85238226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Wei=C3=9F?= Date: Mon, 23 Nov 2020 21:05:08 +0100 Subject: [PATCH 2/2] refactor!: Drop support for Carthage BREAKING CHANGE: Drop support for Carthage due to its issues with Xcode 12. Furthermore SPM will most likely become the main dependency management system for Swift dependencies --- README.md | 17 ----------------- fastlane/Fastfile | 10 +++++----- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 7740918..fbee96d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ Swift 5.0 - - Carthage Compatible - SPM @@ -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`: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a4588a2..4419aac 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -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