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

Commit

Permalink
Merge pull request #197 from tooot-app/main
Browse files Browse the repository at this point in the history
Release v3.1
  • Loading branch information
xmflsct authored Jan 8, 2022
2 parents c443359 + 68282e3 commit 15c861b
Show file tree
Hide file tree
Showing 38 changed files with 1,540 additions and 739 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: -- Step 3 -- Use Expo action
uses: expo/expo-github-action@v6
with:
expo-version: 4.x
expo-version: 5.x
username: ${{ secrets.EXPO_USERNAME }}
token: ${{ secrets.EXPO_TOKEN }}
- name: -- Step 4 -- Install node dependencies
Expand All @@ -33,7 +33,7 @@ jobs:
run: bundle install
- name: -- Step 7 -- Run fastlane
env:
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
ENVIRONMENT: ${{ steps.branch.outputs.branch }}
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

import expo.modules.ApplicationLifecycleDispatcher;
import expo.modules.ReactNativeHostWrapper;
import expo.modules.permissions.PermissionsPackage;
import expo.modules.filesystem.FileSystemPackage;
import expo.modules.updates.UpdatesController;

import java.lang.reflect.InvocationTargetException;
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<resources>
<string name="app_name">tooot</string>
<string name="expo_splash_screen_resize_mode">contain</string>
<string name="expo_splash_screen_status_bar_translucent">false</string>
</resources>
7 changes: 6 additions & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fastlane_version "2.180.1"
fastlane_version "2.199.0"
skip_docs

ensure_env_vars(
Expand Down Expand Up @@ -108,6 +108,11 @@ private_lane :build_ios do
silent: true
)
upload_to_app_store( ipa: IPA_FILE, app_version: VERSION )
download_dsyms
sentry_upload_dsym(
org_slug: ENV["SENTRY_ORGANIZATION"],
project_slug: ENV["SENTRY_PROJECT"],
)
else
if !is_ci
match( type: "adhoc", readonly: true )
Expand Down
4 changes: 1 addition & 3 deletions fastlane/metadata/en-US/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Support iOS version starting from 12
Optimize performance (hopefully)
Using new push and translation service
Optimize performance and fix bugs
4 changes: 1 addition & 3 deletions fastlane/metadata/zh-Hans/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
iOS支持最低版本12
(但愿)性能有改进
使用新的推送和翻译服务
性能有改进及修复错误
54 changes: 21 additions & 33 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
PODS:
- boost (1.76.0)
- DoubleConversion (1.1.6)
- EXApplication (4.0.0):
- EXApplication (4.0.1):
- ExpoModulesCore
- EXAV (10.1.3):
- EXAV (10.2.0):
- ExpoModulesCore
- ReactCommon/turbomodule/core
- EXConstants (13.0.0):
- ExpoModulesCore
- EXCrypto (10.1.1):
Expand All @@ -13,7 +14,7 @@ PODS:
- ExpoModulesCore
- EXErrorRecovery (3.0.4):
- ExpoModulesCore
- EXFileSystem (13.1.0):
- EXFileSystem (13.2.0):
- ExpoModulesCore
- EXFirebaseAnalytics (6.0.0):
- EXFirebaseCore
Expand All @@ -37,20 +38,15 @@ PODS:
- ExpoModulesCore
- EXManifests (0.2.2):
- EXJSONUtils
- EXMediaLibrary (14.0.0):
- ExpoModulesCore
- React-Core
- EXNotifications (0.14.0):
- ExpoModulesCore
- EXPermissions (13.1.0):
- ExpoModulesCore
- Expo (44.0.0):
- Expo (44.0.4):
- ExpoModulesCore
- ExpoHaptics (11.1.0):
- ExpoModulesCore
- ExpoLocalization (12.0.0):
- ExpoModulesCore
- ExpoModulesCore (0.6.3):
- ExpoModulesCore (0.6.4):
- React-Core
- ReactCommon/turbomodule/core
- EXRandom (12.1.1):
Expand All @@ -59,20 +55,20 @@ PODS:
- ExpoModulesCore
- EXSecureStore (11.1.0):
- ExpoModulesCore
- EXSplashScreen (0.14.0):
- EXSplashScreen (0.14.1):
- ExpoModulesCore
- React-Core
- EXStoreReview (5.1.0):
- ExpoModulesCore
- EXStructuredHeaders (2.1.0)
- EXUpdates (0.11.1):
- EXUpdates (0.11.3):
- EXManifests
- ExpoModulesCore
- EXStructuredHeaders
- EXUpdatesInterface
- React-Core
- EXUpdatesInterface (0.5.0)
- EXVideoThumbnails (6.1.0):
- EXVideoThumbnails (6.2.0):
- ExpoModulesCore
- EXWebBrowser (10.1.0):
- ExpoModulesCore
Expand Down Expand Up @@ -377,11 +373,11 @@ PODS:
- glog
- react-native-blur (0.8.0):
- React
- react-native-blurhash (1.1.7):
- react-native-blurhash (1.1.8):
- React-Core
- react-native-cameraroll (4.1.2):
- React-Core
- react-native-netinfo (7.1.6):
- react-native-netinfo (7.1.7):
- React-Core
- react-native-pager-view (5.4.9):
- React-Core
Expand Down Expand Up @@ -530,9 +526,7 @@ DEPENDENCIES:
- EXJSONUtils (from `../node_modules/expo-json-utils/ios`)
- EXKeepAwake (from `../node_modules/expo-keep-awake/ios`)
- EXManifests (from `../node_modules/expo-manifests/ios`)
- EXMediaLibrary (from `../node_modules/expo-media-library/ios`)
- EXNotifications (from `../node_modules/expo-notifications/ios`)
- EXPermissions (from `../node_modules/expo-permissions/ios`)
- Expo (from `../node_modules/expo/ios`)
- ExpoHaptics (from `../node_modules/expo-haptics/ios`)
- ExpoLocalization (from `../node_modules/expo-localization/ios`)
Expand Down Expand Up @@ -653,12 +647,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-keep-awake/ios"
EXManifests:
:path: "../node_modules/expo-manifests/ios"
EXMediaLibrary:
:path: "../node_modules/expo-media-library/ios"
EXNotifications:
:path: "../node_modules/expo-notifications/ios"
EXPermissions:
:path: "../node_modules/expo-permissions/ios"
Expo:
:path: "../node_modules/expo/ios"
ExpoHaptics:
Expand Down Expand Up @@ -779,13 +769,13 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: a7c83b31436843459a1961bfd74b96033dc77234
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
EXApplication: 0e15240e4d125b62f1cae48759ffbbd32b9286a6
EXAV: 8adf9a1c0161144d77e96149a1e5a5f9358be290
EXApplication: bdc8dc27713235565da1029a34385229f31b8e08
EXAV: e501565d5aff495b7b5e9249d489f5ef94db03b2
EXConstants: 5d18484e38e8eacef7695a82214b6ac90133dedf
EXCrypto: e3c0853c2a9ef885928f6227b967b9598132f727
EXDevice: 7de98d8f97088fad9c01e9a68abad07e501208b2
EXErrorRecovery: deea88a01d38f8b1c1181b4e1d179b0ba0e4bb5b
EXFileSystem: 7d1309ba6b38b82ef7fc9e80174de3f9184ac8b4
EXFileSystem: 7bcd3c1428698150d5c8ca140c8183f2ee204048
EXFirebaseAnalytics: 27dbc5cb83c244d8404b2927676299f3e172470e
EXFirebaseCore: 16f39b0ea94ce985a8f2e16cc796bf79bdcfa297
EXFont: 1fb13af43dc517c01c0ff21a6e32f9f9bf2ea602
Expand All @@ -795,22 +785,20 @@ SPEC CHECKSUMS:
EXJSONUtils: f515cf71710855d7ba5bfc6752af3b9a6f6aad01
EXKeepAwake: b571c2ad8323b2fced6e907766e2549f75119471
EXManifests: 50e42e01335df4e54109dee7be5a91bfd37347db
EXMediaLibrary: 6acf919299bccc64a59e6e89a3b792276e309302
EXNotifications: d5b454a2363c8743aa9b2888cc0df70a1d9ee816
EXPermissions: f4c65fa770489cbf16ea17c3013a670671525014
Expo: 6ca1d5ca8c8264a7131a608afcd01561f79f1e6e
Expo: d9b8b5e49c200471fc473a652a84fe30dee73027
ExpoHaptics: c62a5fc7bba0184d0165d559fc2b0fc46168ef40
ExpoLocalization: 83582a967db52987a8479490b056d5eb9fd70552
ExpoModulesCore: d04e519b3e8e21523b195bb21a40144e30f1e163
ExpoModulesCore: 64abda7af7cf659d2fa092934e29c6f4ea7e849f
EXRandom: 06978dcf45075f3c9e17ae5e726b887316ee9877
EXScreenCapture: 0146fdf6ca4c3402a1cf62b2ddb739a840e08c94
EXSecureStore: fa0fdde1c81ceee2a3cb0519e649feae42767969
EXSplashScreen: 845290df0d2730fdedc59ee6ce3b959d8079a350
EXSplashScreen: 7872675b95bb07c25f922b3d3dfae70c76fb5a00
EXStoreReview: 6143555fc912a4a194300992cd297c3e5b521a8a
EXStructuredHeaders: 2ce79a3770bd3795bade1aab215ada70deae8bbc
EXUpdates: a0ef6520618deee31b45d9a09406682c9e724789
EXUpdates: 98b9e647ce7a0e9d5ab67135bf42188c750a99eb
EXUpdatesInterface: f459b515151bd73fff7a35366eace34a6c6a0d3f
EXVideoThumbnails: 6c08e978ed7a5542c5dca04a1757363fd29cb2a1
EXVideoThumbnails: 847d648d6f4bc0c1afad05caa56a487dc543445e
EXWebBrowser: 37388663fa51cbfc883de2244931a5182d948e5f
FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
Expand Down Expand Up @@ -843,9 +831,9 @@ SPEC CHECKSUMS:
React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
React-logger: 933f80c97c633ee8965d609876848148e3fef438
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
react-native-blurhash: e19ea985921732379d17951fd46c99ebe71e9cf3
react-native-blurhash: b7ed7b7de81ae1f9ce52d694f43c5b5cddddcae1
react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
react-native-netinfo: 6f98a7fb549351a8f7f9a6d1ca80afc23e320045
react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097
Expand Down
2 changes: 1 addition & 1 deletion ios/tooot/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
rootView.backgroundColor = [UIColor whiteColor];
rootView.backgroundColor = [UIColor colorNamed:@"SplashScreenBackgroundColor"];
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
UIViewController *rootViewController = [self.reactDelegate createRootViewController];
rootViewController.view = rootView;
Expand Down
4 changes: 2 additions & 2 deletions ios/tooot/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "250",
"green" : "250",
"red" : "250"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "18",
"green" : "18",
"red" : "18"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit 15c861b

Please sign in to comment.