Skip to content

Commit

Permalink
Merge branch 'main' into candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
xmflsct committed Feb 4, 2024
2 parents 027336a + 41c09d4 commit 8678f9a
Show file tree
Hide file tree
Showing 27 changed files with 5,081 additions and 4,670 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/build.yml
Expand Up @@ -7,20 +7,20 @@ on:

jobs:
build-ios:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: tj-actions/branch-names@v6
- uses: tj-actions/branch-names@v8
id: branch
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- run: corepack enable
- run: yarn install
- run: bundle install
- run: yarn app:build ios
env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
SENTRY_ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
LC_ALL: en_US.UTF-8
Expand All @@ -38,18 +38,18 @@ jobs:
GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}

build-android:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: tj-actions/branch-names@v6
- uses: tj-actions/branch-names@v8
id: branch
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- run: corepack enable
- run: yarn install
- run: bundle install
Expand All @@ -67,19 +67,19 @@ jobs:
GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}

create-release:
runs-on: macos-13
runs-on: macos-14
needs: [build-ios, build-android]
steps:
- uses: tj-actions/branch-names@v6
- uses: tj-actions/branch-names@v8
id: branch
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- run: corepack enable
- run: yarn install
- run: bundle install
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
18
20
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .yarnrc.yml
@@ -1,7 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
yarnPath: .yarn/releases/yarn-4.1.0.cjs
8 changes: 4 additions & 4 deletions android/gradle.properties
Expand Up @@ -43,10 +43,10 @@ newArchEnabled=false
# If set to false, you will be using JSC instead.
hermesEnabled=true

org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
# org.gradle.daemon=true
# org.gradle.parallel=true
# org.gradle.configureondemand=true

# The hosted JavaScript engine
# Supported values: expo.jsEngine = "hermes" | "jsc"
Expand Down
2 changes: 1 addition & 1 deletion fastlane/metadata/en-US/release_notes.txt
@@ -1 +1 @@
Enjoy toooting! This version includes following improvements and fixes:
Enjoy toooting! This version includes improvements and fixes.
2 changes: 1 addition & 1 deletion fastlane/metadata/zh-Hans/release_notes.txt
@@ -1 +1 @@
tooot-ing愉快!此版本包括以下改进和修复:
tooot-ing愉快!此版本包括改进和修复。

0 comments on commit 8678f9a

Please sign in to comment.