Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
uses: actions/setup-node@v6
with:
registry-url: https://registry.npmjs.org/
node-version: 24
node-version-file: .node-version

- name: Cache Dependencies
id: cache
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dist
.expo/
dist/
web-build/
/assets/fonts/

# Native
*.orig.*
Expand Down
53 changes: 49 additions & 4 deletions app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,53 @@ import type { ExpoConfig } from 'expo/config'

import { version } from './package.json'

const internalFontsPlugin = [
'expo-font',
{
android: {
fonts: [
{
fontFamily: 'TT Fellows',
fontDefinitions: [
{
path: './assets/fonts/TTFellows-DemiBoldItalic.ttf',
weight: 600,
style: 'italic',
},
{ path: './assets/fonts/TTFellows-DemiBold.ttf', weight: 600 },
{ path: './assets/fonts/TTFellows-Regular.ttf', weight: 400 },
],
},
{
fontFamily: 'Noto Sans',
fontDefinitions: [
{ path: './assets/fonts/NotoSans-Bold.ttf', weight: 700 },
{ path: './assets/fonts/NotoSans-Regular.ttf', weight: 400 },
],
},
],
},
ios: {
fonts: [
'./assets/fonts/TTFellows-DemiBold.ttf',
'./assets/fonts/TTFellows-DemiBoldItalic.ttf',
'./assets/fonts/TTFellows-Regular.ttf',
'./assets/fonts/NotoSans-Regular.ttf',
'./assets/fonts/NotoSans-Bold.ttf',
],
},
},
] satisfies NonNullable<ExpoConfig['plugins']>[number]

const plugins: NonNullable<ExpoConfig['plugins']> = [
'./expo/plugins/withEnsureBundler.js',
'@react-native-async-storage/expo-with-async-storage',
]

if (process.env.UI_KIT_INTERNAL_FONTS === 'true') {
plugins.push(internalFontsPlugin)
}

export default {
expo: {
name: 'CDEK UI',
Expand All @@ -10,6 +57,7 @@ export default {
orientation: 'portrait',
android: { package: 'ru.cdek.uikit.prime' },
ios: {
appleTeamId: 'AY3Q95T9QG',
bundleIdentifier: 'ru.cdek.uikit.prime',
config: { usesNonExemptEncryption: false },
},
Expand All @@ -20,10 +68,7 @@ export default {
},
icon: './icon.png',
updates: { fallbackToCacheTimeout: 0 },
plugins: [
'./expo/plugins/withEnsureBundler.js',
'@react-native-async-storage/expo-with-async-storage',
],
plugins,
assetBundlePatterns: ['**/*'],
} satisfies ExpoConfig,
}
9 changes: 9 additions & 0 deletions fastlane/.env.default
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
APP_NAME=CDEKUI
ANDROID_BUILD_TYPE=Release
ANDROID_KEY_ALIAS=androiddebugkey
ANDROID_KEYSTORE_FILEPATH=$PWD/android/app/debug.keystore
ANDROID_KEYSTORE_PASSWORD=android
ANDROID_KEY_PASSWORD=android
FL_GRADLE_PROJECT_DIR=android
IOS_PROJECT_PATH=ios
IOS_PROJECT_WORKSPACE=CDEKUI
4 changes: 4 additions & 0 deletions fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package_name "ru.cdek.uikit.prime"
app_identifier "ru.cdek.uikit.prime"
itc_team_id "119091977"
team_id "AY3Q95T9QG"
4 changes: 4 additions & 0 deletions fastlane/Matchfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
git_url ENV.fetch("MATCH_GIT_URL")
git_branch "master"
storage_mode "git"
readonly true
4 changes: 4 additions & 0 deletions ios/CDEKUI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_ENTITLEMENTS = CDEKUI/CDEKUI.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = AY3Q95T9QG;
INFOPLIST_FILE = CDEKUI/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -394,6 +397,7 @@
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = ru.cdek.uikit.prime;
PRODUCT_NAME = "CDEKUI";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore ru.cdek.uikit.prime";
SWIFT_OBJC_BRIDGING_HEADER = "CDEKUI/CDEKUI-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1";
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"expo-application": "55.0.14",
"expo-constants": "55.0.15",
"expo-doctor": "1.18.20",
"expo-font": "55.0.6",
"expo-status-bar": "55.0.5",
"inquirer-search-list": "1.2.6",
"jest": "29.7.0",
Expand Down Expand Up @@ -147,7 +148,7 @@
},
"packageManager": "yarn@4.6.0",
"engines": {
"node": "20"
"node": ">=22 <23"
},
"config": {
"commitizen": {
Expand Down
3 changes: 2 additions & 1 deletion yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading