Skip to content

Commit 1e73b06

Browse files
gustavotoyotagustavotoyota
committed
Merge branch 'dev' into main
2 parents 8b7d6c6 + 00d060c commit 1e73b06

29 files changed

+359
-6
lines changed

‎apps/client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@deepnotes/client",
33
"description": "DeepNotes",
44
"homepage": "https://deepnotes.app",
5-
"version": "1.0.17",
5+
"version": "1.0.19",
66
"author": "Gustavo Toyota <[email protected]>",
77
"dependencies": {
88
"@_ueberdosis/prosemirror-tables": "~1.1.3",
@@ -134,7 +134,7 @@
134134
"build:android:ide": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m capacitor -T android --skip-pkg --ide",
135135
"build:electron": "cross-env CI=1 NODE_OPTIONS=--max_old_space_size=4096 quasar build -m electron",
136136
"build:electron:publish": "cross-env CI=1 NODE_OPTIONS=--max_old_space_size=4096 quasar build -m electron --publish always",
137-
"build:ios": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m capacitor -T ios",
137+
"build:ios": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m capacitor -T ios --skip-pkg",
138138
"build:spa": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m spa",
139139
"build:ssr": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m ssr",
140140
"clean": "rimraf --glob ./dist *.tsbuildinfo",

‎apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@
359359
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
360360
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
361361
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
362-
MARKETING_VERSION = 1.0.17;
362+
MARKETING_VERSION = 1.0.19;
363363
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
364364
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
365365
PRODUCT_NAME = "$(TARGET_NAME)";
366366
PROVISIONING_PROFILE_SPECIFIER = "";
367-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iOS App Store Profile";
367+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore app.deepnotes";
368368
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
369369
SWIFT_VERSION = 5.0;
370370
TARGETED_DEVICE_FAMILY = "1,2";
@@ -386,11 +386,11 @@
386386
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
387387
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
388388
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
389-
MARKETING_VERSION = 1.0.17;
389+
MARKETING_VERSION = 1.0.19;
390390
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
391391
PRODUCT_NAME = "$(TARGET_NAME)";
392392
PROVISIONING_PROFILE_SPECIFIER = "";
393-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iOS App Store Profile";
393+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore app.deepnotes";
394394
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
395395
SWIFT_VERSION = 5.0;
396396
TARGETED_DEVICE_FAMILY = "1,2";

‎apps/client/src-capacitor/ios/App/Gemfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane"

‎apps/client/src-capacitor/ios/App/Gemfile.lock‎

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.6)
5+
rexml
6+
addressable (2.8.5)
7+
public_suffix (>= 2.0.2, < 6.0)
8+
artifactory (3.0.15)
9+
atomos (0.1.3)
10+
aws-eventstream (1.2.0)
11+
aws-partitions (1.854.0)
12+
aws-sdk-core (3.187.1)
13+
aws-eventstream (~> 1, >= 1.0.2)
14+
aws-partitions (~> 1, >= 1.651.0)
15+
aws-sigv4 (~> 1.5)
16+
jmespath (~> 1, >= 1.6.1)
17+
aws-sdk-kms (1.72.0)
18+
aws-sdk-core (~> 3, >= 3.184.0)
19+
aws-sigv4 (~> 1.1)
20+
aws-sdk-s3 (1.137.0)
21+
aws-sdk-core (~> 3, >= 3.181.0)
22+
aws-sdk-kms (~> 1)
23+
aws-sigv4 (~> 1.6)
24+
aws-sigv4 (1.6.1)
25+
aws-eventstream (~> 1, >= 1.0.2)
26+
babosa (1.0.4)
27+
claide (1.1.0)
28+
colored (1.2)
29+
colored2 (3.1.2)
30+
commander (4.6.0)
31+
highline (~> 2.0.0)
32+
declarative (0.0.20)
33+
digest-crc (0.6.5)
34+
rake (>= 12.0.0, < 14.0.0)
35+
domain_name (0.6.20231109)
36+
dotenv (2.8.1)
37+
emoji_regex (3.2.3)
38+
excon (0.104.0)
39+
faraday (1.10.3)
40+
faraday-em_http (~> 1.0)
41+
faraday-em_synchrony (~> 1.0)
42+
faraday-excon (~> 1.1)
43+
faraday-httpclient (~> 1.0)
44+
faraday-multipart (~> 1.0)
45+
faraday-net_http (~> 1.0)
46+
faraday-net_http_persistent (~> 1.0)
47+
faraday-patron (~> 1.0)
48+
faraday-rack (~> 1.0)
49+
faraday-retry (~> 1.0)
50+
ruby2_keywords (>= 0.0.4)
51+
faraday-cookie_jar (0.0.7)
52+
faraday (>= 0.8.0)
53+
http-cookie (~> 1.0.0)
54+
faraday-em_http (1.0.0)
55+
faraday-em_synchrony (1.0.0)
56+
faraday-excon (1.1.0)
57+
faraday-httpclient (1.0.1)
58+
faraday-multipart (1.0.4)
59+
multipart-post (~> 2)
60+
faraday-net_http (1.0.1)
61+
faraday-net_http_persistent (1.2.0)
62+
faraday-patron (1.0.0)
63+
faraday-rack (1.0.0)
64+
faraday-retry (1.0.3)
65+
faraday_middleware (1.2.0)
66+
faraday (~> 1.0)
67+
fastimage (2.2.7)
68+
fastlane (2.217.0)
69+
CFPropertyList (>= 2.3, < 4.0.0)
70+
addressable (>= 2.8, < 3.0.0)
71+
artifactory (~> 3.0)
72+
aws-sdk-s3 (~> 1.0)
73+
babosa (>= 1.0.3, < 2.0.0)
74+
bundler (>= 1.12.0, < 3.0.0)
75+
colored
76+
commander (~> 4.6)
77+
dotenv (>= 2.1.1, < 3.0.0)
78+
emoji_regex (>= 0.1, < 4.0)
79+
excon (>= 0.71.0, < 1.0.0)
80+
faraday (~> 1.0)
81+
faraday-cookie_jar (~> 0.0.6)
82+
faraday_middleware (~> 1.0)
83+
fastimage (>= 2.1.0, < 3.0.0)
84+
gh_inspector (>= 1.1.2, < 2.0.0)
85+
google-apis-androidpublisher_v3 (~> 0.3)
86+
google-apis-playcustomapp_v1 (~> 0.1)
87+
google-cloud-storage (~> 1.31)
88+
highline (~> 2.0)
89+
http-cookie (~> 1.0.5)
90+
json (< 3.0.0)
91+
jwt (>= 2.1.0, < 3)
92+
mini_magick (>= 4.9.4, < 5.0.0)
93+
multipart-post (>= 2.0.0, < 3.0.0)
94+
naturally (~> 2.2)
95+
optparse (~> 0.1.1)
96+
plist (>= 3.1.0, < 4.0.0)
97+
rubyzip (>= 2.0.0, < 3.0.0)
98+
security (= 0.1.3)
99+
simctl (~> 1.6.3)
100+
terminal-notifier (>= 2.0.0, < 3.0.0)
101+
terminal-table (~> 3)
102+
tty-screen (>= 0.6.3, < 1.0.0)
103+
tty-spinner (>= 0.8.0, < 1.0.0)
104+
word_wrap (~> 1.0.0)
105+
xcodeproj (>= 1.13.0, < 2.0.0)
106+
xcpretty (~> 0.3.0)
107+
xcpretty-travis-formatter (>= 0.0.3)
108+
gh_inspector (1.1.3)
109+
google-apis-androidpublisher_v3 (0.53.0)
110+
google-apis-core (>= 0.11.0, < 2.a)
111+
google-apis-core (0.11.2)
112+
addressable (~> 2.5, >= 2.5.1)
113+
googleauth (>= 0.16.2, < 2.a)
114+
httpclient (>= 2.8.1, < 3.a)
115+
mini_mime (~> 1.0)
116+
representable (~> 3.0)
117+
retriable (>= 2.0, < 4.a)
118+
rexml
119+
webrick
120+
google-apis-iamcredentials_v1 (0.17.0)
121+
google-apis-core (>= 0.11.0, < 2.a)
122+
google-apis-playcustomapp_v1 (0.13.0)
123+
google-apis-core (>= 0.11.0, < 2.a)
124+
google-apis-storage_v1 (0.29.0)
125+
google-apis-core (>= 0.11.0, < 2.a)
126+
google-cloud-core (1.6.0)
127+
google-cloud-env (~> 1.0)
128+
google-cloud-errors (~> 1.0)
129+
google-cloud-env (1.6.0)
130+
faraday (>= 0.17.3, < 3.0)
131+
google-cloud-errors (1.3.1)
132+
google-cloud-storage (1.45.0)
133+
addressable (~> 2.8)
134+
digest-crc (~> 0.4)
135+
google-apis-iamcredentials_v1 (~> 0.1)
136+
google-apis-storage_v1 (~> 0.29.0)
137+
google-cloud-core (~> 1.6)
138+
googleauth (>= 0.16.2, < 2.a)
139+
mini_mime (~> 1.0)
140+
googleauth (1.8.1)
141+
faraday (>= 0.17.3, < 3.a)
142+
jwt (>= 1.4, < 3.0)
143+
multi_json (~> 1.11)
144+
os (>= 0.9, < 2.0)
145+
signet (>= 0.16, < 2.a)
146+
highline (2.0.3)
147+
http-cookie (1.0.5)
148+
domain_name (~> 0.5)
149+
httpclient (2.8.3)
150+
jmespath (1.6.2)
151+
json (2.6.3)
152+
jwt (2.7.1)
153+
mini_magick (4.12.0)
154+
mini_mime (1.1.5)
155+
multi_json (1.15.0)
156+
multipart-post (2.3.0)
157+
nanaimo (0.3.0)
158+
naturally (2.2.1)
159+
optparse (0.1.1)
160+
os (1.1.4)
161+
plist (3.7.0)
162+
public_suffix (5.0.4)
163+
rake (13.1.0)
164+
representable (3.2.0)
165+
declarative (< 0.1.0)
166+
trailblazer-option (>= 0.1.1, < 0.2.0)
167+
uber (< 0.2.0)
168+
retriable (3.1.2)
169+
rexml (3.2.6)
170+
rouge (2.0.7)
171+
ruby2_keywords (0.0.5)
172+
rubyzip (2.3.2)
173+
security (0.1.3)
174+
signet (0.18.0)
175+
addressable (~> 2.8)
176+
faraday (>= 0.17.5, < 3.a)
177+
jwt (>= 1.5, < 3.0)
178+
multi_json (~> 1.10)
179+
simctl (1.6.10)
180+
CFPropertyList
181+
naturally
182+
terminal-notifier (2.0.0)
183+
terminal-table (3.0.2)
184+
unicode-display_width (>= 1.1.1, < 3)
185+
trailblazer-option (0.1.2)
186+
tty-cursor (0.7.1)
187+
tty-screen (0.8.1)
188+
tty-spinner (0.9.3)
189+
tty-cursor (~> 0.7)
190+
uber (0.1.0)
191+
unicode-display_width (2.5.0)
192+
webrick (1.8.1)
193+
word_wrap (1.0.0)
194+
xcodeproj (1.23.0)
195+
CFPropertyList (>= 2.3.3, < 4.0)
196+
atomos (~> 0.1.3)
197+
claide (>= 1.0.2, < 2.0)
198+
colored2 (~> 3.1)
199+
nanaimo (~> 0.3.0)
200+
rexml (~> 3.2.4)
201+
xcpretty (0.3.0)
202+
rouge (~> 2.0.7)
203+
xcpretty-travis-formatter (1.0.1)
204+
xcpretty (~> 0.2, >= 0.0.7)
205+
206+
PLATFORMS
207+
x86_64-darwin-21
208+
209+
DEPENDENCIES
210+
fastlane
211+
212+
BUNDLED WITH
213+
2.4.10

‎apps/client/src-capacitor/ios/App/fastlane/Appfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
app_identifier("app.deepnotes") # The bundle identifier of your app
2+
apple_id("[email protected]") # Your Apple Developer Portal username
3+
4+
itc_team_id("126468926") # App Store Connect Team ID
5+
team_id("NK86B84G2A") # Developer Portal Team ID
6+
7+
# For more information about the Appfile, see:
8+
# https://docs.fastlane.tools/advanced/#appfile

‎apps/client/src-capacitor/ios/App/fastlane/Deliverfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The Deliverfile allows you to store various App Store Connect metadata
2+
# For more information, check out the docs
3+
# https://docs.fastlane.tools/actions/deliver/

‎apps/client/src-capacitor/ios/App/fastlane/Fastfile‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# This file contains the fastlane.tools configuration
2+
# You can find the documentation at https://docs.fastlane.tools
3+
#
4+
# For a list of all available actions, check out
5+
#
6+
# https://docs.fastlane.tools/actions
7+
#
8+
# For a list of all available plugins, check out
9+
#
10+
# https://docs.fastlane.tools/plugins/available-plugins
11+
#
12+
13+
# Uncomment the line if you want fastlane to automatically update itself
14+
# update_fastlane
15+
16+
default_platform(:ios)
17+
18+
platform :ios do
19+
before_all do
20+
setup_circle_ci
21+
end
22+
23+
desc "Push a new release build to the App Store"
24+
lane :release do
25+
increment_build_number(xcodeproj: "App.xcodeproj")
26+
build_app(workspace: "App.xcworkspace", scheme: "App")
27+
upload_to_app_store
28+
end
29+
30+
desc "Upload Release to App Store"
31+
lane :upload_release do
32+
# Get the version number from the project and check against
33+
# the latest build already available on App Store Connect, then
34+
# increase the build number by 1. If no build is available
35+
# for that version, then start at 1
36+
increment_build_number(
37+
build_number: app_store_build_number + 1,
38+
)
39+
# Set up Distribution code signing and build the app
40+
match(type: "appstore", readonly: is_ci)
41+
gym(scheme: "App")
42+
# Upload the binary to App Store Connect
43+
app_store_connect_api_key
44+
deliver(
45+
submit_for_review: false,
46+
precheck_include_in_app_purchases: false,
47+
force: true
48+
)
49+
end
50+
end

‎apps/client/src-capacitor/ios/App/fastlane/Matchfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
git_url("[email protected]:DeepNotesApp/FastlaneMatch")
2+
3+
storage_mode("git")
4+
5+
type("development") # The default type, can be: appstore, adhoc, enterprise or development
6+
7+
app_identifier(["app.deepnotes"])
8+
username("[email protected]") # Your Apple Developer Portal username
9+
10+
# For all available options run `fastlane match --help`
11+
# Remove the # in the beginning of the line to enable the other options
12+
13+
# The docs are available on https://docs.fastlane.tools/actions/match

‎apps/client/src-capacitor/ios/App/fastlane/metadata/copyright.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2023 Gustavo Takachi Toyota

‎apps/client/src-capacitor/ios/App/fastlane/metadata/en-US/apple_tv_privacy_policy.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)