diff --git a/.github/actions/setup-apple/action.yml b/.github/actions/setup-apple/action.yml index 4087ecbb74..f8c6203440 100644 --- a/.github/actions/setup-apple/action.yml +++ b/.github/actions/setup-apple/action.yml @@ -3,11 +3,6 @@ name: Setup Apple envirionment runs: using: "composite" steps: - # TODO: This and Ruby should be versioned - - name: Install Cocoapods - shell: bash - run: sudo gem install cocoapods - - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 14.3.1 + xcode-version: 26.2 diff --git a/.github/workflows/publish-cocoapods-release.yml b/.github/workflows/publish-cocoapods-release.yml deleted file mode 100644 index cd9a36619b..0000000000 --- a/.github/workflows/publish-cocoapods-release.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Publish CocoaPods Release - -on: - push: - tags: - - '*' - workflow_dispatch: - -jobs: - publish: - name: Publish to CocoaPods trunk - runs-on: macos-13 - - steps: - - uses: actions/checkout@v3 - - - name: Setup - uses: ./.github/actions/setup-apple - - - name: Publish Yoga - run: pod trunk push Yoga.podspec - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} diff --git a/.github/workflows/validate-apple.yml b/.github/workflows/validate-swiftpm.yml similarity index 50% rename from .github/workflows/validate-apple.yml rename to .github/workflows/validate-swiftpm.yml index 3097cfe23d..844825e064 100644 --- a/.github/workflows/validate-apple.yml +++ b/.github/workflows/validate-swiftpm.yml @@ -1,4 +1,4 @@ -name: Validate Apple +name: Validate SwiftPM on: pull_request: @@ -9,22 +9,9 @@ on: workflow_dispatch: jobs: - lint-pods: - name: Build [CocoaPods] - runs-on: macos-13 - - steps: - - uses: actions/checkout@v3 - - - name: Setup - uses: ./.github/actions/setup-apple - - - name: pod lib lint - run: pod lib lint --verbose --include-podspecs=**/*.podspec - test: - name: Build [SwiftPM] - runs-on: macos-13 + name: Build + runs-on: macos-latest steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 83fa6459bd..6b5624f94b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/Yoga.svg)](http://cocoapods.org/pods/Yoga) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga) ![SPM](https://img.shields.io/badge/SPM-Supported-blue.svg) +# Yoga [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga) ![SPM](https://img.shields.io/badge/SPM-Supported-blue.svg) Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages. diff --git a/Yoga.podspec b/Yoga.podspec deleted file mode 100644 index 9d9b618066..0000000000 --- a/Yoga.podspec +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - - -Pod::Spec.new do |spec| - spec.name = 'Yoga' - spec.version = '0.0.0' - spec.license = { :type => 'MIT', :file => "LICENSE" } - spec.homepage = 'https://yogalayout.dev/' - spec.documentation_url = 'https://yogalayout.dev/docs' - - spec.summary = 'An embeddable and performant flexbox layout engine with bindings for multiple languages' - - spec.authors = {'Meta Open Source' => 'opensource@meta.com'} - spec.source = { - :git => 'https://github.com/facebook/yoga.git', - :tag => "v#{spec.version.to_s}", - } - - spec.ios.deployment_target = "13.4" - - spec.module_name = 'yoga' - spec.requires_arc = false - spec.pod_target_xcconfig = { - 'DEFINES_MODULE' => 'YES', - 'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"', - } - - spec.compiler_flags = [ - '-fno-omit-frame-pointer', - '-fexceptions', - '-Wall', - '-Werror', - '-std=c++20', - '-fPIC' - ] - - spec.swift_version = '5.1' - spec.source_files = 'yoga/**/*.{h,cpp}' - spec.header_mappings_dir = 'yoga' - - public_header_files = 'yoga/*.h' - spec.public_header_files = public_header_files - - all_header_files = 'yoga/**/*.h' - spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files) - spec.preserve_paths = [all_header_files] -end diff --git a/set-version.py b/set-version.py index 806fd579e4..1b931a6b90 100755 --- a/set-version.py +++ b/set-version.py @@ -35,11 +35,3 @@ f.seek(0) f.truncate() f.write(new_contents) - -with open("Yoga.podspec", "r+") as f: - new_contents = re.sub( - r"spec\.version = '.*'", f"spec.version = '{version}'", f.read() - ) - f.seek(0) - f.truncate() - f.write(new_contents)