Merge branch 'main' into candidate

This commit is contained in:
xmflsct 2022-09-21 21:56:06 +02:00
commit ba1ad2682b
4 changed files with 13 additions and 16 deletions

View File

@ -10,7 +10,6 @@ export default (): ExpoConfig => ({
version, version,
extra: { environment: process.env.ENVIRONMENT }, extra: { environment: process.env.ENVIRONMENT },
privacy: 'hidden', privacy: 'hidden',
assetBundlePatterns: ['assets/*'],
hooks: { hooks: {
postPublish: [ postPublish: [
{ {

View File

@ -144,15 +144,17 @@ lane :android do
end end
lane :release do lane :release do
build_android_apk if ENVIRONMENT == 'release'
set_github_release( build_android_apk
repository_name: GITHUB_REPO, set_github_release(
name: GITHUB_RELEASE, repository_name: GITHUB_REPO,
tag_name: GITHUB_RELEASE, name: GITHUB_RELEASE,
description: "No changelog provided", tag_name: GITHUB_RELEASE,
commitish: git_branch, description: "No changelog provided",
is_prerelease: ENVIRONMENT == 'candidate', commitish: git_branch,
upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"] is_prerelease: false,
) upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"]
)
end
rocket rocket
end end

View File

@ -1,6 +1,3 @@
module.exports = { module.exports = {
transformer: { transformer: { inlineRequires: true }
assetPlugins: ['expo-asset/tools/hashAssetFiles'],
inlineRequires: true
}
} }

View File

@ -16,7 +16,6 @@ import {
getSettingsLanguage getSettingsLanguage
} from '@utils/slices/settingsSlice' } from '@utils/slices/settingsSlice'
import ThemeManager from '@utils/styles/ThemeManager' import ThemeManager from '@utils/styles/ThemeManager'
import 'expo-asset'
import * as SplashScreen from 'expo-splash-screen' import * as SplashScreen from 'expo-splash-screen'
import React, { useCallback, useEffect, useState } from 'react' import React, { useCallback, useEffect, useState } from 'react'
import { LogBox, Platform } from 'react-native' import { LogBox, Platform } from 'react-native'