From d8da5dcdeccd9a072eb746e6ce4517e4d097610e Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Fri, 29 Sep 2023 19:45:35 +0200 Subject: [PATCH 1/5] Drop support for Carthage --- CHANGELOG.md | 1 + README.md | 9 --------- fastlane/Fastfile | 10 +--------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa2667..92048ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Removed - Drop support for Swift 5.3, we now use `@resultBuilder` instead of `@_functionBuilder` +- Drop support for Carthage ## [0.1.0] - 2021-04-28 diff --git a/README.md b/README.md index 68d2ae3..38eb248 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ CompositionalLayoutDSL is a Swift library. It makes easier to create composition - [Getting started](#getting-started) - [Installation](#installation) - [CocoaPods](#cocoapods) - - [Carthage](#carthage) - [Swift Package Manager](#swift-package-manager) - [Credits](#credits) - [Behind the scene](#behind-the-scene) @@ -121,14 +120,6 @@ To integrate `CompositionalLayoutDSL` into your Xcode project using CocoaPods, s pod 'CompositionalLayoutDSL', '~> 0.1.0' ``` -### Carthage - -To integrate `CompositionalLayoutDSL` into your Xcode project using Carthage, specify it in your `Cartfile`: - -``` -github "faberNovel/CompositionalLayoutDSL" ~> 0.1.0 -``` - ### Swift Package Manager `CompositionalLayoutDSL` can be installed as a Swift Package with Xcode 11 or higher. To install it, add a package using Xcode or a dependency to your Package.swift file: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1de08db..7a67274 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -91,21 +91,13 @@ lane :publish_release do section_identifier: "[#{target_version}]" ) - carthage(command: "build", no_skip_current: true) - carthage( - frameworks: ["CompositionalLayoutDSL"], - output: "CompositionalLayoutDSL.framework.zip", - command: "archive" - ) - set_github_release( repository_name: ENV["REPO"], api_bearer: ENV["GITHUB_TOKEN"], name: "v#{target_version}", tag_name: "v#{target_version}", description: changelog, - commitish: "main", - upload_assets: ["CompositionalLayoutDSL.framework.zip"] + commitish: "main" ) pod_push(allow_warnings: true) From 760f737d82a250ba0b37809dbfb7ad8ae2b2a85e Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Fri, 29 Sep 2023 19:46:36 +0200 Subject: [PATCH 2/5] Update version on README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38eb248..42bfc60 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ collectionView.collectionViewLayout = LayoutBuilder { To integrate `CompositionalLayoutDSL` into your Xcode project using CocoaPods, specify it in your Podfile: ``` -pod 'CompositionalLayoutDSL', '~> 0.1.0' +pod 'CompositionalLayoutDSL', '~> 0.2.0' ``` ### Swift Package Manager @@ -125,7 +125,7 @@ pod 'CompositionalLayoutDSL', '~> 0.1.0' `CompositionalLayoutDSL` can be installed as a Swift Package with Xcode 11 or higher. To install it, add a package using Xcode or a dependency to your Package.swift file: ```swift -.package(url: "https://github.com/faberNovel/CompositionalLayoutDSL") +.package(url: "https://github.com/faberNovel/CompositionalLayoutDSL", from: "0.2.0") ``` ## Behind the scene From ba7eb927232a78411d031b35c8448cf15f933aec Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Fri, 29 Sep 2023 19:50:36 +0200 Subject: [PATCH 3/5] Use macos runner for documentation generation as Apple framework are needed --- .github/workflows/documentation.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 50598f6..7dbf4e7 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -5,9 +5,12 @@ on: branches: - main +env: + DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer + jobs: build: - runs-on: ubuntu-latest + runs-on: macOS-13 steps: - uses: actions/checkout@v2 From b24bae9df25ee5af20c71370be4291608c76d5c5 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Fri, 29 Sep 2023 20:09:55 +0200 Subject: [PATCH 4/5] Fix link in Readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42bfc60..b06d13d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ CompositionalLayoutDSL is a Swift library. It makes easier to create composition ## Documentation -An online documentation can be found [here](https://fabernovel.github.io/CompositionalLayoutDSL/documentation/CompositionalLayoutDSL). +An online documentation can be found [here](https://fabernovel.github.io/CompositionalLayoutDSL/documentation/compositionallayoutdsl/). The documentation can be build locally and seen with this command: ```bash From abcc05fc684f7955293ad691271c96fe81ccd874 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Fri, 29 Sep 2023 20:12:15 +0200 Subject: [PATCH 5/5] Use correct secret for cocoapods --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7275ece..a3eae13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: env: LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_AP_TOKEN }} + COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TOKEN_CI }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_COMMITTER_NAME: Bot Fabernovel GIT_AUTHOR_NAME: Bot Fabernovel