Skip to content

Commit

Permalink
Ditch CocoaPods and go to standalone .xcodeproj (#1169)
Browse files Browse the repository at this point in the history
* Vendor in PullToRefresh and ditch CocoaPods.

* Ditch .xcworkspace in favour of standalone .xcodeproj

* Point CI at .xcodeproj

* Explicitly always do Compile CSS build phase

* Change "workspace" to "project" in read me
  • Loading branch information
nolanw authored Oct 23, 2023
1 parent 0a85dfc commit 1c85ff7
Show file tree
Hide file tree
Showing 82 changed files with 161 additions and 2,540 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: xcodebuild test
run: xcodebuild -workspace Awful.xcworkspace -scheme Awful -configuration Debug -destination "platform=iOS Simulator,name=iPhone 14,OS=latest" test
run: xcodebuild -project Awful.xcodeproj -scheme Awful -configuration Debug -destination "platform=iOS Simulator,name=iPhone 14,OS=latest" test
30 changes: 30 additions & 0 deletions App/Templates/Acknowledgements.html.stencil
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.</pre>
</section>

<section>
<header>
<h1>PullToRefresh</h1>
<a href="https://github.com/Yalantis/PullToRefresh">github.com/Yalantis/PullToRefresh</a>
</header>

<pre>
The MIT License (MIT)

Copyright (c) 2018

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</pre>
</section>

<section>
<header>
<h1>Sourcery</h1>
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
"repositoryURL": "https://github.com/Flipboard/FLAnimatedImage",
"state": {
"branch": null,
"revision": "e7f9fd4681ae41bf6f3056db08af4f401d61da52",
"version": "1.0.16"
"revision": "d4f07b6f164d53c1212c3e54d6460738b1981e9f",
"version": "1.0.17"
}
},
{
"package": "HTMLReader",
"repositoryURL": "https://github.com/nolanw/HTMLReader",
"state": {
"branch": null,
"revision": "ba104cdd80783d9d206f27df6535fffb553c79e2",
"version": "2.2.0"
"revision": "d4003bf59feead2361f684a372123eae0afe104f",
"version": "2.2.1"
}
},
{
"package": "Lottie",
"repositoryURL": "https://github.com/airbnb/lottie-ios.git",
"state": {
"branch": null,
"revision": "d6feea26a370019b4d3a85f5984cb95a2734776f",
"version": "4.2.0"
"revision": "45517c3cfec9469bbdd4f86e32393c28ae9df0bc",
"version": "4.3.3"
}
},
{
"package": "Nuke",
"repositoryURL": "https://github.com/kean/Nuke",
"state": {
"branch": null,
"revision": "472a03c15f39592007d94f25abe554350bc8aa2b",
"version": "10.5.1"
"revision": "a002b7fd786f2df2ed4333fe73a9727499fd9d97",
"version": "10.11.2"
}
},
{
Expand All @@ -51,17 +51,17 @@
"repositoryURL": "https://github.com/mxcl/PromiseKit",
"state": {
"branch": null,
"revision": "aea48ea1855f5d82e2dffa6027afce3aab8f3dd7",
"version": "6.13.3"
"revision": "8a98e31a47854d3180882c8068cc4d9381bf382d",
"version": "6.22.1"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "f717bbce0e19f0129fc001b2b6bed43b70fd8b87",
"version": "0.9.1"
"revision": "f79d4ecbf8bc4e1579fbd86c3e1d652fb6876c53",
"version": "0.9.2"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:Awful.xctestplan"
reference = "container:Config/Awful.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
Expand Down
31 changes: 0 additions & 31 deletions Awful.xcworkspace/contents.xcworkspacedata

This file was deleted.

10 changes: 0 additions & 10 deletions Awful.xcworkspace/xcshareddata/IDETemplateMacros.plist

This file was deleted.

12 changes: 2 additions & 10 deletions Xcode/Awful.xctestplan → Config/Awful.xctestplan
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,15 @@
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:..\/AwfulCore",
"containerPath" : "container:AwfulCore",
"identifier" : "AwfulCoreTests",
"name" : "AwfulCoreTests"
}
},
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:..\/AwfulScraping",
"identifier" : "AwfulScrapingTests",
"name" : "AwfulScrapingTests"
}
},
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:..\/Smilies",
"containerPath" : "container:Smilies",
"identifier" : "SmiliesTests",
"name" : "SmiliesTests"
}
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Xcode/Config/Common.xcconfig → Config/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Project-level build settings common to all configurations.

// Place for settings that shouldn't be committed, like API keys. See README.md for suggestions.
#include? "../Local.xcconfig"
#include? "Local.xcconfig"

ALWAYS_SEARCH_USER_PATHS = NO

Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

95 changes: 0 additions & 95 deletions Gemfile.lock

This file was deleted.

39 changes: 0 additions & 39 deletions Podfile

This file was deleted.

16 changes: 0 additions & 16 deletions Podfile.lock

This file was deleted.

16 changes: 0 additions & 16 deletions Pods/Manifest.lock

This file was deleted.

Loading

0 comments on commit 1c85ff7

Please sign in to comment.