Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
colejd committed Oct 14, 2020
2 parents f490f93 + 876a8bb commit 83db00f
Show file tree
Hide file tree
Showing 211 changed files with 19,638 additions and 7,144 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -1,2 +1,3 @@
*.pbxproj merge=union
*.pbxproj filter=filter-credentials
"Slide for Reddit/Info.plist" filter=filter-credentials
3 changes: 2 additions & 1 deletion .github/FUNDING.yml
@@ -1,3 +1,4 @@
# These are supported funding model platforms

github: ccrama
github: [ccrama] #If any contributor wants to add themselves here, please let me know!
custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=56FKCCYLX7L72
94 changes: 94 additions & 0 deletions .github/workflows/beta-automation.yml
@@ -0,0 +1,94 @@
name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
tags:
- beta-*

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: macOS-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Force Xcode 12.0
run: sudo xcode-select -switch /Applications/Xcode_12.0.app

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Install bundles if no cache
- name: Move to checked out directory
run: |
ls -la
cd $GITHUB_WORKSPACE
# Use cached ruby bundles if available
- uses: actions/cache@v1
id: cache-bundles
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gem-
# Install bundles if no cache
- name: Install bundles
if: steps.cache-bundles.outputs.cache-hit != 'true'
run: bundle install

# Use cached pods if available
- uses: actions/cache@v2
id: cache-pods
with:
path: Pods
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-pods-
# Install pods if no cache
- name: Install pods
if: steps.cache-pods.outputs.cache-hit != 'true'
run: pod install

# Restore cached SwiftPM packages if available
- uses: actions/cache@v2
with:
path: .build
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
restore-keys: |
${{ runner.os }}-spm-
# https://github.community/t/ios-code-signing-provisioning/16614/4
# https://github.com/hashicorp/terraform-github-actions/issues/39
- name: Setup SSH Keys and known_hosts for fastlane match
env:
PRIVATE_KEY: ${{ secrets.MATCH_DEPLOY_PRIVATE_KEY }}
# Copied from https://github.com/maddox/actions/blob/master/ssh/entrypoint.sh
run: |
echo Force SSH connection
git config --global --add url."git@github.com:".insteadOf "https://github.com/"
echo Setup Github credentials
git config --local user.email "actions@github.com"
git config --local user.name "GitHub Actions"
SSH_PATH="$HOME/.ssh"
mkdir -p "$SSH_PATH"
touch "$SSH_PATH/known_hosts"
echo "$PRIVATE_KEY" > "$SSH_PATH/id_rsa"
chmod 700 "$SSH_PATH"
ssh-keyscan github.com >> ~/.ssh/known_hosts
chmod 600 "$SSH_PATH/known_hosts"
chmod 600 "$SSH_PATH/id_rsa"
eval $(ssh-agent)
ssh-add "$SSH_PATH/id_rsa"
- name: Fastlane Action
run: bundle exec fastlane beta --verbose
env:
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
5 changes: 5 additions & 0 deletions .gitignore
@@ -1,3 +1,6 @@
fastlane/report.xml
ProfilingArtifacts/

# Xcode workspace user data
# Slide\ for\ Reddit.xcworkspace/
# .DS_Store
Expand Down Expand Up @@ -67,6 +70,8 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.ipa
*.dSYM.zip

## Xcode Patch
*.xcodeproj/*
Expand Down
10 changes: 10 additions & 0 deletions Favorite SubredditsExtension.entitlements
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.$(USR_DOMAIN).redditslide.prefs</string>
</array>
</dict>
</plist>
102 changes: 61 additions & 41 deletions Gemfile.lock
@@ -1,10 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.1)
CFPropertyList (3.0.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.336.0)
aws-sdk-core (3.102.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.35.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.72.0)
aws-sdk-core (~> 3, >= 3.102.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
colored (1.2)
Expand All @@ -13,36 +29,37 @@ GEM
highline (~> 1.7.2)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.4.1)
digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
excon (0.68.0)
faraday (0.17.0)
excon (0.75.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.1.7)
fastlane (2.134.0)
fastlane (2.149.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.17)
excon (>= 0.71.0, < 1.0.0)
faraday (>= 0.17, < 2.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.13.1)
faraday_middleware (>= 0.13.1, < 2.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
Expand All @@ -61,51 +78,54 @@ GEM
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.8.1, < 2.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-api-client (0.23.9)
google-api-client (0.38.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
google-cloud-core (1.4.1)
signet (~> 0.12)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.3.0)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.2)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.26.2)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.23)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (>= 0.6.2, < 0.10.0)
googleauth (0.6.7)
faraday (~> 0.12)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.13.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
json (2.2.0)
jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.1)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mini_magick (4.9.5)
memoist (0.16.2)
mini_magick (4.10.1)
mini_mime (1.0.2)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.6)
naturally (2.2.0)
os (1.0.1)
os (1.1.0)
plist (3.5.0)
public_suffix (2.0.5)
representable (3.0.4)
Expand All @@ -116,29 +136,29 @@ GEM
rouge (2.0.7)
rubyzip (1.3.0)
security (0.1.3)
signet (0.12.0)
signet (0.14.0)
addressable (~> 2.3)
faraday (~> 0.9)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.6)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.7.0)
tty-screen (0.7.0)
tty-spinner (0.9.1)
tty-cursor (0.7.1)
tty-screen (0.8.0)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.13.0)
xcodeproj (1.17.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
18 changes: 12 additions & 6 deletions Open in Slide/ActionViewController.swift
Expand Up @@ -41,18 +41,24 @@ class ActionViewController: UIViewController {

var comps = URLComponents(url: shareURL as URL, resolvingAgainstBaseURL: false)!
comps.scheme = "slide"
let newUrl = comps.url!

if self.openURL(newUrl) {
self.extensionContext!.cancelRequest(withError: NSError())
if let newUrl = comps.url {
if self.openURL(newUrl) {
self.extensionContext!.cancelRequest(withError: NSError())
} else {
self.extensionContext!.cancelRequest(withError: NSError())
}
} else {
self.extensionContext!.cancelRequest(withError: NSError())
if self.openURL(shareURL as URL) {
self.extensionContext!.cancelRequest(withError: NSError())
} else {
self.extensionContext!.cancelRequest(withError: NSError())
}
}
}
})
break
} else if count == length && !urlFound {
self.extensionContext!.cancelRequest(withError: NSError())
self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Open in Slide/Info.plist
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>194</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down

0 comments on commit 83db00f

Please sign in to comment.