From f0cc6356d9cdd55f91b45d3172417fc4094b8431 Mon Sep 17 00:00:00 2001 From: Colin Tremblay Date: Fri, 23 Feb 2024 11:03:51 -0700 Subject: [PATCH 1/4] match platforms/dependencies in Package.swift to info in podspec --- Package.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6578e04..6dc8d07 100644 --- a/Package.swift +++ b/Package.swift @@ -5,13 +5,18 @@ import PackageDescription let package = Package( name: "TLDExtract", + platforms: [ + .iOS(.v10), + .macOS(.v10_12), + .tvOS(.v11) + ], products: [ .library( name: "TLDExtract", targets: ["TLDExtract"]) ], dependencies: [ - .package(url: "https://github.com/gumob/PunycodeSwift.git", .branch("master")) + .package(url: "https://github.com/gumob/PunycodeSwift.git", .upToNextMajor(from: "2.1.0")) ], targets: [ .target( From 8876df1c1efe4bf08b916d12a9a22aeb024ec9f2 Mon Sep 17 00:00:00 2001 From: Colin Tremblay Date: Thu, 22 Aug 2024 11:15:24 -0600 Subject: [PATCH 2/4] Fix typo --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6dc8d07..f86eaa2 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ let package = Package( targets: [ .target( name: "TLDExtract", - dependencies: ["Punnycode"], + dependencies: ["Punycode"], path: "Source"), .testTarget( name: "TLDExtractSwiftTests", From 71870991784d2468997ca76554d4a474b87ec354 Mon Sep 17 00:00:00 2001 From: gumob Date: Sun, 25 Aug 2024 18:44:33 +0900 Subject: [PATCH 3/4] chore: Remove line break from end --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6855ba2..6298a86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -397,4 +397,4 @@ jobs: # run: | # pod repo update # pod trunk push TLDExtractSwift.podspec --allow-warnings - needs: carthage + needs: carthage \ No newline at end of file From cc3acc77196cc418aed7a4cd896c74d6f81643e0 Mon Sep 17 00:00:00 2001 From: gumob Date: Sun, 25 Aug 2024 18:48:23 +0900 Subject: [PATCH 4/4] ci: Disable linting cocoapod --- .github/workflows/main.yml | 166 ++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6298a86..a46839c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -315,86 +315,86 @@ jobs: --cache-builds needs: SPM - cocoapods: - name: "Pods: ${{ matrix.platform }}, ${{ matrix.configuration }}" - runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - strategy: - fail-fast: true - matrix: - include: - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "macos" - configuration: "Release" - name: "Pods: macOS, Release" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "macos" - configuration: "Debug" - name: "Pods: macOS, Debug" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "ios" - configuration: "Release" - name: "Pods: iOS, Release" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "ios" - configuration: "Debug" - name: "Pods: iOS, Debug" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "tvos" - configuration: "Release" - name: "Pods: tvOS, Release" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "tvos" - configuration: "Debug" - name: "Pods: tvOS, Debug" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "watchos" - configuration: "Release" - name: "Pods: watchOS, Release" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "watchos" - configuration: "Debug" - name: "Pods: watchOS, Debug" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "visionos" - configuration: "Release" - name: "Pods: visionOS, Release" - - xcode: "Xcode_15.4" - runsOn: macOS-14 - platform: "visionos" - configuration: "Debug" - name: "Pods: visionOS, Debug" - steps: - - name: Update CocoaPods - if: ${{ matrix.platform == 'visionos' }} - run: gem install cocoapods - - name: Checkout - uses: actions/checkout@v4 - - name: Pod lib lint - run: | - pod lib lint --verbose \ - --configuration=${{ matrix.configuration }} \ - --platforms=${{ matrix.platform }} \ - TLDExtractSwift.podspec - - name: Pod lib lint - Use Static Frameworks - run: | - pod lib lint --verbose --use-static-frameworks \ - --configuration=${{ matrix.configuration }} \ - --platforms=${{ matrix.platform }} \ - TLDExtractSwift.podspec - # - name: Pod Push - # if: github.ref == 'refs/heads/main' - # run: | - # pod repo update - # pod trunk push TLDExtractSwift.podspec --allow-warnings - needs: carthage \ No newline at end of file + # cocoapods: + # name: "Pods: ${{ matrix.platform }}, ${{ matrix.configuration }}" + # runs-on: ${{ matrix.runsOn }} + # env: + # DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" + # strategy: + # fail-fast: true + # matrix: + # include: + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "macos" + # configuration: "Release" + # name: "Pods: macOS, Release" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "macos" + # configuration: "Debug" + # name: "Pods: macOS, Debug" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "ios" + # configuration: "Release" + # name: "Pods: iOS, Release" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "ios" + # configuration: "Debug" + # name: "Pods: iOS, Debug" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "tvos" + # configuration: "Release" + # name: "Pods: tvOS, Release" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "tvos" + # configuration: "Debug" + # name: "Pods: tvOS, Debug" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "watchos" + # configuration: "Release" + # name: "Pods: watchOS, Release" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "watchos" + # configuration: "Debug" + # name: "Pods: watchOS, Debug" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "visionos" + # configuration: "Release" + # name: "Pods: visionOS, Release" + # - xcode: "Xcode_15.4" + # runsOn: macOS-14 + # platform: "visionos" + # configuration: "Debug" + # name: "Pods: visionOS, Debug" + # steps: + # - name: Update CocoaPods + # if: ${{ matrix.platform == 'visionos' }} + # run: gem install cocoapods + # - name: Checkout + # uses: actions/checkout@v4 + # - name: Pod lib lint + # run: | + # pod lib lint --verbose \ + # --configuration=${{ matrix.configuration }} \ + # --platforms=${{ matrix.platform }} \ + # TLDExtractSwift.podspec + # - name: Pod lib lint - Use Static Frameworks + # run: | + # pod lib lint --verbose --use-static-frameworks \ + # --configuration=${{ matrix.configuration }} \ + # --platforms=${{ matrix.platform }} \ + # TLDExtractSwift.podspec + # # - name: Pod Push + # # if: github.ref == 'refs/heads/main' + # # run: | + # # pod repo update + # # pod trunk push TLDExtractSwift.podspec --allow-warnings + # needs: carthage