Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ updates:
patterns:
- "*"

- package-ecosystem: cocoapods
- package-ecosystem: swift
directory: "/"
schedule:
interval: weekly
8 changes: 1 addition & 7 deletions .github/workflows/ios_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ jobs:
with:
bundler-cache: true

- name: install pods
run: pod install

# conan itself is pinned by conan-odr-index so recipes and client stay in sync
- name: install conan
run: pip3 install -r conan-odr-index/requirements.txt
Expand Down Expand Up @@ -121,9 +118,6 @@ jobs:
with:
bundler-cache: true

- name: install pods
run: pod install

- name: install conan
run: pip3 install -r conan-odr-index/requirements.txt

Expand Down Expand Up @@ -160,7 +154,7 @@ jobs:
- name: build
run: >
xcodebuild
-workspace OpenDocumentReader.xcworkspace
-project OpenDocumentReader.xcodeproj
-scheme "${{ matrix.scheme }}"
-configuration "${{ matrix.configuration }}"
-sdk iphoneos
Expand Down
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ playground.xcworkspace
# Package.resolved
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
#
Expand Down
195 changes: 60 additions & 135 deletions OpenDocumentReader.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

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

10 changes: 0 additions & 10 deletions OpenDocumentReader.xcworkspace/contents.xcworkspacedata

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion OpenDocumentReader/DocumentViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ A view controller for displaying and editing documents.

import UIKit
import WebKit
import ScrollableSegmentedControl
import UIKit.UIPrinter
import GoogleMobileAds
import AppTrackingTransparency
Expand Down
2 changes: 1 addition & 1 deletion OpenDocumentReader/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</barButtonItem>
</items>
</toolbar>
<view hidden="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIx-zo-9kG" customClass="ScrollableSegmentedControl" customModule="ScrollableSegmentedControl">
<view hidden="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIx-zo-9kG" customClass="ScrollableSegmentedControl" customModule="OpenDocumentReader" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="0.0"/>
<color key="backgroundColor" red="0.97636479139328003" green="0.97653168439865112" blue="0.97635418176651001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
Expand Down
21 changes: 21 additions & 0 deletions OpenDocumentReader/Vendor/ScrollableSegmentedControl/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2016 Goce Petrovski @GocePetrovski

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.
12 changes: 12 additions & 0 deletions OpenDocumentReader/Vendor/ScrollableSegmentedControl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# ScrollableSegmentedControl

Vendored from https://github.com/GocePetrovski/ScrollableSegmentedControl at tag
`1.5.0`, unmodified.

Upstream was archived in February 2022 and never gained Swift Package Manager
support, so it was the one dependency keeping CocoaPods alive in this project.
The source is MIT licensed (see `LICENSE`), so it lives here instead.

Because it is part of the app module now, the storyboard refers to it with
`customModule="OpenDocumentReader"` rather than
`customModule="ScrollableSegmentedControl"`.
Loading
Loading