Skip to content

Commit

Permalink
Merge pull request #99 from TwidereProject/release/1.4.2
Browse files Browse the repository at this point in the history
Release v1.4.2
  • Loading branch information
MainasuK authored Jul 25, 2022
2 parents 59817e3 + 1f39bf5 commit 5359347
Show file tree
Hide file tree
Showing 176 changed files with 5,981 additions and 696 deletions.
27 changes: 27 additions & 0 deletions .arkana.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import_name: 'ArkanaKeys'
namespace: 'Keys'
result_path: 'dependencies'
flavors:
- AppStore
swift_declaration_strategy: let
should_generate_unit_tests: true
package_manager: spm
environments:
- Debug
- Release
global_secrets:
# AppStore build Secret
- AppSecret
- HostKeyPublic
environment_secrets:
# Will lookup for <Key>Debug and <Key>Release env vars (assuming no flavor was declared)
# Twitter OAuth 1.0a Keys
- ConsumerKey
- ConsumerKeySecret
- OauthEndpoint
# Twitter OAuth 2.0 Keys
- ClientID
- ClientSecret
- Oauth2Endpoint
# Mastodon Push Notification Endpoint
- MastodonNotificationEndpoint
2 changes: 1 addition & 1 deletion .github/scripts/build-debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ xcrun xcodebuild \
-parallelizeTargets \
-showBuildTimingSummary \
clean \
build | xcpretty
build
19 changes: 6 additions & 13 deletions .github/scripts/setup.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
#!/bin/bash

sudo gem install cocoapods-keys
set -xeu
set -o pipefail

# set "TwidereX" project name to make cocoapods-keys using the right project
pod keys set app_secret ${APP_SECRET} "TwidereX"
pod keys set consumer_key ${CONSUMER_KEY} "TwidereX"
pod keys set consumer_key_secret ${CONSUMER_KEY_SECRET} "TwidereX"
pod keys set client_id "" "TwidereX"
pod keys set client_id_debug "" "TwidereX"
pod keys set host_key_public ${HOST_KEY_PUBLIC} "TwidereX"
pod keys set oauth_endpoint ${OAUTH_ENDPOINT} "TwidereX"
pod keys set oauth_endpoint_debug "oob" "TwidereX"
pod keys set oauth2_endpoint ${OAUTH2_ENDPOINT} "TwidereX"
pod keys set oauth2_endpoint_debug ${OAUTH2_ENDPOINT_DEBUG} "TwidereX"
gem install bundler
bundle install

pod install
bundle exec arkana
bundle exec pod install
29 changes: 19 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,32 @@ on:
jobs:
build:
name: CI Build Test
runs-on: macos-11
runs-on: macos-12
steps:
- name: checkout
uses: actions/checkout@v2

- name: force Xcode 13.2
run: sudo xcode-select -switch /Applications/Xcode_13.2.app
- name: force Xcode 13.4.1
run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app

- name: setup
env:
APP_SECRET: ${{ secrets.APP_SECRET }}
CONSUMER_KEY: ${{ secrets.CONSUMER_KEY }}
CONSUMER_KEY_SECRET: ${{ secrets.CONSUMER_KEY_SECRET }}
HOST_KEY_PUBLIC: ${{ secrets.HOST_KEY_PUBLIC }}
OAUTH_ENDPOINT: ${{ secrets.OAUTH_ENDPOINT }}
OAUTH2_ENDPOINT: ${{ secrets.OAUTH2_ENDPOINT }}
OAUTH2_ENDPOINT_DEBUG: ${{ secrets.OAUTH2_ENDPOINT_DEBUG }}
AppSecret: ${{ secrets.AppSecret }}
HostKeyPublic: ${{ secrets.HostKeyPublic }}
ConsumerKeyDebug: ${{ secrets.ConsumerKeyDebug }}
ConsumerKeyRelease: ${{ secrets.ConsumerKeyRelease }}
ConsumerKeySecretDebug: ${{ secrets.ConsumerKeySecretDebug }}
ConsumerKeySecretRelease: ${{ secrets.ConsumerKeySecretRelease }}
OauthEndpointDebug: ${{ secrets.OauthEndpointDebug }}
OauthEndpointRelease: ${{ secrets.OauthEndpointRelease }}
ClientIDDebug: ${{ secrets.ClientIDDebug }}
ClientIDRelease: ${{ secrets.ClientIDRelease }}
ClientSecretDebug: ${{ secrets.ClientSecretDebug }}
ClientSecretRelease: ${{ secrets.ClientSecretRelease }}
Oauth2EndpointDebug: ${{ secrets.Oauth2EndpointDebug }}
Oauth2EndpointRelease: ${{ secrets.Oauth2EndpointRelease }}
MastodonNotificationEndpointDebug: ${{ secrets.MastodonNotificationEndpointDebug }}
MastodonNotificationEndpointRelease: ${{ secrets.MastodonNotificationEndpointRelease }}
run: exec ./.github/scripts/setup.sh

- name: build
Expand Down
27 changes: 19 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: push
jobs:
build:
name: Release
runs-on: macos-11
runs-on: macos-12
if: contains(github.event.head_commit.message, '@r2d2/release')
steps:
- name: checkout
Expand All @@ -28,16 +28,27 @@ jobs:
api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}

- name: force Xcode 13.2
run: sudo xcode-select -switch /Applications/Xcode_13.2.app
- name: force Xcode 13.4.1
run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app

- name: setup
env:
APP_SECRET: ${{ secrets.APP_SECRET }}
CONSUMER_KEY: ${{ secrets.CONSUMER_KEY }}
CONSUMER_KEY_SECRET: ${{ secrets.CONSUMER_KEY_SECRET }}
HOST_KEY_PUBLIC: ${{ secrets.HOST_KEY_PUBLIC }}
OAUTH_ENDPOINT: ${{ secrets.OAUTH_ENDPOINT }}
AppSecret: ${{ secrets.AppSecret }}
HostKeyPublic: ${{ secrets.HostKeyPublic }}
ConsumerKeyDebug: ${{ secrets.ConsumerKeyDebug }}
ConsumerKeyRelease: ${{ secrets.ConsumerKeyRelease }}
ConsumerKeySecretDebug: ${{ secrets.ConsumerKeySecretDebug }}
ConsumerKeySecretRelease: ${{ secrets.ConsumerKeySecretRelease }}
OauthEndpointDebug: ${{ secrets.OauthEndpointDebug }}
OauthEndpointRelease: ${{ secrets.OauthEndpointRelease }}
ClientIDDebug: ${{ secrets.ClientIDDebug }}
ClientIDRelease: ${{ secrets.ClientIDRelease }}
ClientSecretDebug: ${{ secrets.ClientSecretDebug }}
ClientSecretRelease: ${{ secrets.ClientSecretRelease }}
Oauth2EndpointDebug: ${{ secrets.Oauth2EndpointDebug }}
Oauth2EndpointRelease: ${{ secrets.Oauth2EndpointRelease }}
MastodonNotificationEndpointDebug: ${{ secrets.MastodonNotificationEndpointDebug }}
MastodonNotificationEndpointRelease: ${{ secrets.MastodonNotificationEndpointRelease }}
run: exec ./.github/scripts/setup.sh

- name: build
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,8 @@ iOSInjectionProject/
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.toptal.com/developers/gitignore/api/swift,xcode,cocoapods

env/**/**
!env/.env

dependencies/
2 changes: 2 additions & 0 deletions .version
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1.4.2
110
58 changes: 0 additions & 58 deletions AppShared/AppSecret.swift

This file was deleted.

4 changes: 2 additions & 2 deletions AppShared/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>88</string>
<string>111</string>
</dict>
</plist>
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source "https://rubygems.org"

gem 'arkana'
gem "cocoapods"
gem "cocoapods-clean"
gem "xcpretty"
111 changes: 111 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
rexml
activesupport (6.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
arkana (1.1.1)
colorize (~> 0.8)
dotenv (~> 2.7)
yaml (~> 0.2)
atomos (0.1.3)
claide (1.1.0)
cocoapods (1.11.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-clean (0.0.1)
cocoapods-core (1.11.3)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
colorize (0.8.1)
concurrent-ruby (1.1.10)
dotenv (2.7.6)
escape (0.0.4)
ethon (0.15.0)
ffi (>= 1.15.0)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
json (2.6.2)
minitest (5.16.2)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.7)
rexml (3.2.5)
rouge (2.0.7)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
xcodeproj (1.22.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
yaml (0.2.0)
zeitwerk (2.6.0)

PLATFORMS
arm64-darwin-21

DEPENDENCIES
arkana
cocoapods
cocoapods-clean
xcpretty

BUNDLED WITH
2.3.17
31 changes: 31 additions & 0 deletions NotificationService/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?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>CFBundleShortVersionString</key>
<string>1.4.2</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>NotificationService</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleVersion</key>
<string>117</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.usernotifications.service</string>
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
</dict>
</dict>
</plist>
Loading

0 comments on commit 5359347

Please sign in to comment.