Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xmflsct committed May 16, 2023
2 parents e58f9cb + c1e9c73 commit 8517186
Show file tree
Hide file tree
Showing 22 changed files with 1,623 additions and 1,913 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build-ios:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: tj-actions/branch-names@v6
id: branch
Expand All @@ -20,7 +20,7 @@ jobs:
- run: bundle install
- run: yarn app:build ios
env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.3.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,7 +38,7 @@ jobs:
GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}

build-android:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: tj-actions/branch-names@v6
id: branch
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}

create-release:
runs-on: macos-12
runs-on: macos-13
needs: [build-ios, build-android]
steps:
- uses: tj-actions/branch-names@v6
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
kotlinVersion = '1.8.10'
kotlinVersion = '1.8.21'

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
Expand Down
3 changes: 2 additions & 1 deletion fastlane/metadata/en-US/release_notes.txt
@@ -1,2 +1,3 @@
Enjoy toooting! This version includes following improvements and fixes:
- Added Greek translation
- Long press avatar in tab bar to quickly switch to another account
- Fix poll notifications wrongly greyed out
6 changes: 3 additions & 3 deletions fastlane/metadata/zh-Hans/release_notes.txt
@@ -1,3 +1,3 @@
toooting愉快!此版本包括以下改进和修复:
- 新增希腊语
- 新增neodb专辑、播客及剧集卡片
tooot-ing愉快!此版本包括以下改进和修复:
- 长按底部菜单头像快速切换账户
- 修复投票通知显示

0 comments on commit 8517186

Please sign in to comment.