Skip to content

Commit

Permalink
Xcode Compatibility Test; Update Docs; Remove support for Swift 5.2-5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaofei86 committed Jul 12, 2023
1 parent 1288ee0 commit eed5864
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CarbonCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
spec.authors = { 'Baidu' => '[email protected]' }
spec.source = { :git => 'https://github.com/baidu/CarbonGraph.git', :tag => spec.version }

spec.swift_versions = ['5.2', '5.3', '5.4', '5.5']
spec.swift_version = '5.5'
spec.ios.deployment_target = '9.0'

spec.source_files = 'CarbonCore/CarbonCore/**/*.swift'
Expand Down
10 changes: 4 additions & 6 deletions CarbonCore/CarbonCore/CarbonCore.docc/Compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,19 @@ The Requirements and Compatibility
| CarbonCore Stable Version | Required iOS Version | Required Swift Version |
| --- | --- | --- |
| 1.2.2 - 1.3.2 | 9.0 + | 5.2 + |
| 1.3.3 | 9.0 + | 5.5 + |

### CarbonCore build for distribution

| Xcode Version | Swift Version | MacOS Version | Build for distribution |
| --- | --- | --- | --- |
| 11.4 | 5.2 | Catalina 10.15.7 | passing |
| 12.1 | 5.3 | Catalina 10.15.7 | passing |
| 12.4 | 5.3.2 | Catalina 10.15.7 | passing |
| ~~12.5~~ | ~~5.4~~ | ~~Big Sur 11.6~~ | ~~error~~ |
| ~~12.5.1~~ | ~~5.4.2~~ | ~~Big Sur 11.6~~ | ~~error~~ |
| 13.2 | 5.5 | Big Sur 11.6 | passing |
| 14.3.1 | 5.8.1 | Ventura 13.4.1 | passing |
| 15.0 | 5.9 | Ventura 13.4.1 | passing |

### CarbonObjC Version Compatibility

| CarbonObjC Version | CarbonCore Compatible Version |
| --- | --- |
| 1.2.2 | 1.2.2 |
| 1.3.1 | 1.3.1 - 1.3.2 |
| 1.3.1 | 1.3.1 - 1.3.3 |
11 changes: 10 additions & 1 deletion CarbonCore/CarbonCore/CarbonCore.docc/Contribution.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ You are more than welcome to contribute code to the project. You can contribute
> 1. Open Carbon.xcworkspace with Xcode
> 2. Execute Command + U under CarbonCore and CarbonObjC Scheme respectively
The project administrator will merge the stable-state feature branch into develop at the appropriate time, delete the feature branch and create a new release branch besed on develop. Projects that need early access to new features can always use the code from the release branch. After a release is done on at least one project, the release branch will merge back into develop and main branch, and the new version will be released on the main branch.
The project administrator will merge the stable-state feature branch into the develop branch at the appropriate time, delete the feature branch, and create a new release branch based on develop. Projects that require early access to new features can always utilize the code from the release branch. Once a release is completed for at least one project, the release branch will be merged back into the develop and main branches, and the new version will be released on the main branch.

Release commands reference:
```
pod lib lint CarbonCore.podspec
git tag x.x.x
git push origin x.x.x
pod spec lint CarbonCore.podspec
pod trunk push CarbonCore.podspec
```

## Join us

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions CarbonCore/CarbonCore/Configuration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import Foundation

#if swift(>=5.4)
/// Result builder for object context configuration
@resultBuilder public struct ConfigurationBuilder {
public static func buildBlock(_ components: [DefinitionBuilder]...) -> [DefinitionBuilder] {
Expand Down Expand Up @@ -41,13 +40,6 @@ import Foundation
return components.flatMap { $0 }
}
}
#else
@_functionBuilder public struct ConfigurationBuilder {
public static func buildBlock(_ components: DefinitionBuilder...) -> [DefinitionBuilder] {
return components
}
}
#endif

/// Object context configuration protocol
///
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,22 @@ The CarbonGraph project contains 2 frameworks:
| CarbonCore Stable Version | Required iOS Version | Required Swift Version |
| --- | --- | --- |
| 1.2.2 - 1.3.2 | 9.0 + | 5.2 + |
| 1.3.3 | 9.0 + | 5.5 + |

* CarbonObjC Version Compatibility

| CarbonObjC Version | CarbonCore Compatible Version |
| --- | --- |
| 1.2.2 | 1.2.2 |
| 1.3.1 | 1.3.1 - 1.3.2 |
| 1.3.1 | 1.3.1 - 1.3.3 |

For more information see [Compatibility](./CarbonCore/CarbonCore/CarbonCore.docc/Compatibility.md)

## Installation

CocoaPods is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate CarbonGraph into your Xcode project using CocoaPods, specify it in your Podfile:

> pod 'CarbonCore', '~> 1.3.1'
> pod 'CarbonCore', '~> 1.3.3'
## Quick Start

Expand Down

0 comments on commit eed5864

Please sign in to comment.