Skip to content

Commit

Permalink
Move IGListKit onto SPM
Browse files Browse the repository at this point in the history
Resolves #331 - Move IGListKit to SPM; remove Carthage

I have had enough of Carthage, and, despite the fact that the IGListKit SPM changes haven't landed in their repository yet, I am moving us off Carthage and onto SPM for IGLK.
  • Loading branch information
aaronbrethorst committed Dec 25, 2020
1 parent eb22882 commit 9ed8631
Show file tree
Hide file tree
Showing 801 changed files with 31 additions and 69,552 deletions.
34 changes: 12 additions & 22 deletions .github/workflows/obakittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ jobs:
xcode-version: latest-stable
- uses: actions/checkout@v2

# Use cache for Carthage (saves up to 12 minutes on incremental builds). If the Cartfile has changed,
# such as an updated dependency, it will trigger a rebuild of all dependencies.
- uses: actions/cache@v2
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
restore-keys: |
${{ runner.os }}-carthage-
- uses: actions/cache@v2
with:
path: .build
Expand All @@ -32,39 +24,37 @@ jobs:
${{ runner.os }}-spm-
- name: Install xcodegen
run: brew install xcodegen
- name: Build Carthage
run: scripts/carthage_build
- name: Generate xcodeproj for OneBusAway
run: scripts/generate_project OneBusAway

# Build
- name: Build OneBusAway
run: xcodebuild clean build-for-testing
-scheme 'App'
run: xcodebuild clean build-for-testing
-scheme 'App'
-destination 'name=iPhone 11 Pro'
-quiet

# Unit Test
- name: OBAKit Unit Test
run: xcodebuild test-without-building
-only-testing:OBAKitTests
-project 'OBAKit.xcodeproj'
-scheme 'App'
-destination 'name=iPhone 11 Pro'
run: xcodebuild test-without-building
-only-testing:OBAKitTests
-project 'OBAKit.xcodeproj'
-scheme 'App'
-destination 'name=iPhone 11 Pro'
-resultBundlePath OBAKitTests.xcresult
-quiet
- name: Upload OBAKitTests results
uses: actions/upload-artifact@v2
with:
name: OBAKitTests_xcresult
path: OBAKitTests.xcresult

# UI Test
- name: OBAKit UI Test
run: xcodebuild test-without-building
-only-testing:OBAKitUITests
-project 'OBAKit.xcodeproj'
-scheme 'App'
run: xcodebuild test-without-building
-only-testing:OBAKitUITests
-project 'OBAKit.xcodeproj'
-scheme 'App'
-destination 'name=iPhone 11 Pro'
-resultBundlePath OBAKitUITests.xcresult
-quiet
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ playground.xcworkspace
# Swift Package Manager
.build/


# Carthage
Carthage/Build

# fastlane
fastlane/report.xml
fastlane/Preview.html
Expand Down
1 change: 0 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ included: # paths to include during linting. `--path` is ignored if present.
- OBAKitCore
- TodayView
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- OBAKit/SwipeCellKit
- OBAKitCore/Models/Protobuf/gtfs-realtime.pb.swift
force_try:
Expand Down
3 changes: 3 additions & 0 deletions Apps/Shared/app_shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ packages:
Hyperconnectivity:
url: https://github.com/rwbutler/Hyperconnectivity.git
exactVersion: 1.1.0
IGListKit:
url: https://github.com/3a4oT/IGListKit.git
branch: spmBrain
MarqueeLabel:
url: https://github.com/cbpowell/MarqueeLabel.git
exactVersion: 4.0.5
Expand Down
3 changes: 0 additions & 3 deletions Cartfile

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.resolved

This file was deleted.

80 changes: 0 additions & 80 deletions Carthage/Checkouts/IGListKit/.github/CONTRIBUTING.md

This file was deleted.

22 changes: 0 additions & 22 deletions Carthage/Checkouts/IGListKit/.github/ISSUE_TEMPLATE.md

This file was deleted.

10 changes: 0 additions & 10 deletions Carthage/Checkouts/IGListKit/.github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

19 changes: 0 additions & 19 deletions Carthage/Checkouts/IGListKit/.github/RELEASE_CHECKLIST.md

This file was deleted.

57 changes: 0 additions & 57 deletions Carthage/Checkouts/IGListKit/.gitignore

This file was deleted.

8 changes: 0 additions & 8 deletions Carthage/Checkouts/IGListKit/.slather.yml

This file was deleted.

Loading

0 comments on commit 9ed8631

Please sign in to comment.