Skip to content
This repository was archived by the owner on Oct 30, 2024. It is now read-only.

Commit 83db00f

Browse files
committed
Merge branch 'develop'
2 parents f490f93 + 876a8bb commit 83db00f

File tree

211 files changed

+19638
-7144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+19638
-7144
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.pbxproj merge=union
22
*.pbxproj filter=filter-credentials
3+
"Slide for Reddit/Info.plist" filter=filter-credentials

.github/FUNDING.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# These are supported funding model platforms
22

3-
github: ccrama
3+
github: [ccrama] #If any contributor wants to add themselves here, please let me know!
4+
custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=56FKCCYLX7L72
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: CI
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
push:
7+
tags:
8+
- beta-*
9+
10+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
11+
jobs:
12+
# This workflow contains a single job called "build"
13+
build:
14+
# The type of runner that the job will run on
15+
runs-on: macOS-latest
16+
17+
# Steps represent a sequence of tasks that will be executed as part of the job
18+
steps:
19+
- name: Force Xcode 12.0
20+
run: sudo xcode-select -switch /Applications/Xcode_12.0.app
21+
22+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
23+
- uses: actions/checkout@v2
24+
25+
# Install bundles if no cache
26+
- name: Move to checked out directory
27+
run: |
28+
ls -la
29+
cd $GITHUB_WORKSPACE
30+
31+
# Use cached ruby bundles if available
32+
- uses: actions/cache@v1
33+
id: cache-bundles
34+
with:
35+
path: vendor/bundle
36+
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
37+
restore-keys: |
38+
${{ runner.os }}-gem-
39+
40+
# Install bundles if no cache
41+
- name: Install bundles
42+
if: steps.cache-bundles.outputs.cache-hit != 'true'
43+
run: bundle install
44+
45+
# Use cached pods if available
46+
- uses: actions/cache@v2
47+
id: cache-pods
48+
with:
49+
path: Pods
50+
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
51+
restore-keys: |
52+
${{ runner.os }}-pods-
53+
54+
# Install pods if no cache
55+
- name: Install pods
56+
if: steps.cache-pods.outputs.cache-hit != 'true'
57+
run: pod install
58+
59+
# Restore cached SwiftPM packages if available
60+
- uses: actions/cache@v2
61+
with:
62+
path: .build
63+
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
64+
restore-keys: |
65+
${{ runner.os }}-spm-
66+
67+
# https://github.community/t/ios-code-signing-provisioning/16614/4
68+
# https://github.com/hashicorp/terraform-github-actions/issues/39
69+
- name: Setup SSH Keys and known_hosts for fastlane match
70+
env:
71+
PRIVATE_KEY: ${{ secrets.MATCH_DEPLOY_PRIVATE_KEY }}
72+
# Copied from https://github.com/maddox/actions/blob/master/ssh/entrypoint.sh
73+
run: |
74+
echo Force SSH connection
75+
git config --global --add url."[email protected]:".insteadOf "https://github.com/"
76+
echo Setup Github credentials
77+
git config --local user.email "[email protected]"
78+
git config --local user.name "GitHub Actions"
79+
80+
SSH_PATH="$HOME/.ssh"
81+
mkdir -p "$SSH_PATH"
82+
touch "$SSH_PATH/known_hosts"
83+
echo "$PRIVATE_KEY" > "$SSH_PATH/id_rsa"
84+
chmod 700 "$SSH_PATH"
85+
ssh-keyscan github.com >> ~/.ssh/known_hosts
86+
chmod 600 "$SSH_PATH/known_hosts"
87+
chmod 600 "$SSH_PATH/id_rsa"
88+
eval $(ssh-agent)
89+
ssh-add "$SSH_PATH/id_rsa"
90+
91+
- name: Fastlane Action
92+
run: bundle exec fastlane beta --verbose
93+
env:
94+
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
fastlane/report.xml
2+
ProfilingArtifacts/
3+
14
# Xcode workspace user data
25
# Slide\ for\ Reddit.xcworkspace/
36
# .DS_Store
@@ -67,6 +70,8 @@ DerivedData/
6770
!default.mode2v3
6871
*.perspectivev3
6972
!default.perspectivev3
73+
*.ipa
74+
*.dSYM.zip
7075

7176
## Xcode Patch
7277
*.xcodeproj/*
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.application-groups</key>
6+
<array>
7+
<string>group.$(USR_DOMAIN).redditslide.prefs</string>
8+
</array>
9+
</dict>
10+
</plist>

Gemfile.lock

Lines changed: 61 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.1)
4+
CFPropertyList (3.0.2)
55
addressable (2.7.0)
66
public_suffix (>= 2.0.2, < 5.0)
77
atomos (0.1.3)
8+
aws-eventstream (1.1.0)
9+
aws-partitions (1.336.0)
10+
aws-sdk-core (3.102.1)
11+
aws-eventstream (~> 1, >= 1.0.2)
12+
aws-partitions (~> 1, >= 1.239.0)
13+
aws-sigv4 (~> 1.1)
14+
jmespath (~> 1.0)
15+
aws-sdk-kms (1.35.0)
16+
aws-sdk-core (~> 3, >= 3.99.0)
17+
aws-sigv4 (~> 1.1)
18+
aws-sdk-s3 (1.72.0)
19+
aws-sdk-core (~> 3, >= 3.102.1)
20+
aws-sdk-kms (~> 1)
21+
aws-sigv4 (~> 1.1)
22+
aws-sigv4 (1.2.1)
23+
aws-eventstream (~> 1, >= 1.0.2)
824
babosa (1.0.3)
925
claide (1.0.3)
1026
colored (1.2)
@@ -13,36 +29,37 @@ GEM
1329
highline (~> 1.7.2)
1430
declarative (0.0.10)
1531
declarative-option (0.1.0)
16-
digest-crc (0.4.1)
32+
digest-crc (0.5.1)
1733
domain_name (0.5.20190701)
1834
unf (>= 0.0.5, < 1.0.0)
1935
dotenv (2.7.5)
2036
emoji_regex (1.0.1)
21-
excon (0.68.0)
22-
faraday (0.17.0)
37+
excon (0.75.0)
38+
faraday (1.0.1)
2339
multipart-post (>= 1.2, < 3)
2440
faraday-cookie_jar (0.0.6)
2541
faraday (>= 0.7.4)
2642
http-cookie (~> 1.0.0)
27-
faraday_middleware (0.13.1)
28-
faraday (>= 0.7.4, < 1.0)
43+
faraday_middleware (1.0.0)
44+
faraday (~> 1.0)
2945
fastimage (2.1.7)
30-
fastlane (2.134.0)
46+
fastlane (2.149.1)
3147
CFPropertyList (>= 2.3, < 4.0.0)
3248
addressable (>= 2.3, < 3.0.0)
49+
aws-sdk-s3 (~> 1.0)
3350
babosa (>= 1.0.2, < 2.0.0)
3451
bundler (>= 1.12.0, < 3.0.0)
3552
colored
3653
commander-fastlane (>= 4.4.6, < 5.0.0)
3754
dotenv (>= 2.1.1, < 3.0.0)
3855
emoji_regex (>= 0.1, < 2.0)
39-
excon (>= 0.45.0, < 1.0.0)
40-
faraday (~> 0.17)
56+
excon (>= 0.71.0, < 1.0.0)
57+
faraday (>= 0.17, < 2.0)
4158
faraday-cookie_jar (~> 0.0.6)
42-
faraday_middleware (~> 0.13.1)
59+
faraday_middleware (>= 0.13.1, < 2.0)
4360
fastimage (>= 2.1.0, < 3.0.0)
4461
gh_inspector (>= 1.1.2, < 2.0.0)
45-
google-api-client (>= 0.21.2, < 0.24.0)
62+
google-api-client (>= 0.37.0, < 0.39.0)
4663
google-cloud-storage (>= 1.15.0, < 2.0.0)
4764
highline (>= 1.7.2, < 2.0.0)
4865
json (< 3.0.0)
@@ -61,51 +78,54 @@ GEM
6178
tty-screen (>= 0.6.3, < 1.0.0)
6279
tty-spinner (>= 0.8.0, < 1.0.0)
6380
word_wrap (~> 1.0.0)
64-
xcodeproj (>= 1.8.1, < 2.0.0)
81+
xcodeproj (>= 1.13.0, < 2.0.0)
6582
xcpretty (~> 0.3.0)
6683
xcpretty-travis-formatter (>= 0.0.3)
6784
gh_inspector (1.1.3)
68-
google-api-client (0.23.9)
85+
google-api-client (0.38.0)
6986
addressable (~> 2.5, >= 2.5.1)
70-
googleauth (>= 0.5, < 0.7.0)
87+
googleauth (~> 0.9)
7188
httpclient (>= 2.8.1, < 3.0)
72-
mime-types (~> 3.0)
89+
mini_mime (~> 1.0)
7390
representable (~> 3.0)
7491
retriable (>= 2.0, < 4.0)
75-
signet (~> 0.9)
76-
google-cloud-core (1.4.1)
92+
signet (~> 0.12)
93+
google-cloud-core (1.5.0)
7794
google-cloud-env (~> 1.0)
78-
google-cloud-env (1.3.0)
79-
faraday (~> 0.11)
80-
google-cloud-storage (1.16.0)
95+
google-cloud-errors (~> 1.0)
96+
google-cloud-env (1.3.2)
97+
faraday (>= 0.17.3, < 2.0)
98+
google-cloud-errors (1.0.1)
99+
google-cloud-storage (1.26.2)
100+
addressable (~> 2.5)
81101
digest-crc (~> 0.4)
82-
google-api-client (~> 0.23)
102+
google-api-client (~> 0.33)
83103
google-cloud-core (~> 1.2)
84-
googleauth (>= 0.6.2, < 0.10.0)
85-
googleauth (0.6.7)
86-
faraday (~> 0.12)
104+
googleauth (~> 0.9)
105+
mini_mime (~> 1.0)
106+
googleauth (0.13.0)
107+
faraday (>= 0.17.3, < 2.0)
87108
jwt (>= 1.4, < 3.0)
88109
memoist (~> 0.16)
89110
multi_json (~> 1.11)
90111
os (>= 0.9, < 2.0)
91-
signet (~> 0.7)
112+
signet (~> 0.14)
92113
highline (1.7.10)
93114
http-cookie (1.0.3)
94115
domain_name (~> 0.5)
95116
httpclient (2.8.3)
96-
json (2.2.0)
117+
jmespath (1.4.0)
118+
json (2.3.0)
97119
jwt (2.1.0)
98-
memoist (0.16.1)
99-
mime-types (3.3)
100-
mime-types-data (~> 3.2015)
101-
mime-types-data (3.2019.1009)
102-
mini_magick (4.9.5)
120+
memoist (0.16.2)
121+
mini_magick (4.10.1)
122+
mini_mime (1.0.2)
103123
multi_json (1.14.1)
104124
multi_xml (0.6.0)
105125
multipart-post (2.0.0)
106126
nanaimo (0.2.6)
107127
naturally (2.2.0)
108-
os (1.0.1)
128+
os (1.1.0)
109129
plist (3.5.0)
110130
public_suffix (2.0.5)
111131
representable (3.0.4)
@@ -116,29 +136,29 @@ GEM
116136
rouge (2.0.7)
117137
rubyzip (1.3.0)
118138
security (0.1.3)
119-
signet (0.12.0)
139+
signet (0.14.0)
120140
addressable (~> 2.3)
121-
faraday (~> 0.9)
141+
faraday (>= 0.17.3, < 2.0)
122142
jwt (>= 1.5, < 3.0)
123143
multi_json (~> 1.10)
124-
simctl (1.6.6)
144+
simctl (1.6.8)
125145
CFPropertyList
126146
naturally
127147
slack-notifier (2.3.2)
128148
terminal-notifier (2.0.0)
129149
terminal-table (1.8.0)
130150
unicode-display_width (~> 1.1, >= 1.1.1)
131-
tty-cursor (0.7.0)
132-
tty-screen (0.7.0)
133-
tty-spinner (0.9.1)
151+
tty-cursor (0.7.1)
152+
tty-screen (0.8.0)
153+
tty-spinner (0.9.3)
134154
tty-cursor (~> 0.7)
135155
uber (0.1.0)
136156
unf (0.1.4)
137157
unf_ext
138-
unf_ext (0.0.7.6)
139-
unicode-display_width (1.6.0)
158+
unf_ext (0.0.7.7)
159+
unicode-display_width (1.7.0)
140160
word_wrap (1.0.0)
141-
xcodeproj (1.13.0)
161+
xcodeproj (1.17.0)
142162
CFPropertyList (>= 2.3.3, < 4.0)
143163
atomos (~> 0.1.3)
144164
claide (>= 1.0.2, < 2.0)

Open in Slide/ActionViewController.swift

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,24 @@ class ActionViewController: UIViewController {
4141

4242
var comps = URLComponents(url: shareURL as URL, resolvingAgainstBaseURL: false)!
4343
comps.scheme = "slide"
44-
let newUrl = comps.url!
45-
46-
if self.openURL(newUrl) {
47-
self.extensionContext!.cancelRequest(withError: NSError())
44+
if let newUrl = comps.url {
45+
if self.openURL(newUrl) {
46+
self.extensionContext!.cancelRequest(withError: NSError())
47+
} else {
48+
self.extensionContext!.cancelRequest(withError: NSError())
49+
}
4850
} else {
49-
self.extensionContext!.cancelRequest(withError: NSError())
51+
if self.openURL(shareURL as URL) {
52+
self.extensionContext!.cancelRequest(withError: NSError())
53+
} else {
54+
self.extensionContext!.cancelRequest(withError: NSError())
55+
}
5056
}
5157
}
5258
})
5359
break
5460
} else if count == length && !urlFound {
55-
self.extensionContext!.cancelRequest(withError: NSError())
61+
self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil)
5662
}
5763
}
5864

Open in Slide/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<string>194</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)