Skip to content

Commit 44dfd9d

Browse files
committed
fix: Correct issues with RN Update for Android
- Update React Native Vector Icons - Update Android and some iOS version numbers - Update icon names to new names in App.js
1 parent 56f5a64 commit 44dfd9d

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
lines changed

App.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ function getTabBarIcon(route) {
102102
return ({ color, size }) => {
103103
let iconName;
104104
if (route.name === 'RandomStack') {
105-
iconName = 'md-cube';
105+
iconName = 'cube';
106106
} else if (route.name === 'ResourcesStack') {
107-
iconName = 'md-book';
107+
iconName = 'book';
108108
} else if (route.name === 'AdvancedStack') {
109-
iconName = 'md-create';
109+
iconName = 'create';
110110
} else if (route.name === 'MoreStack') {
111111
iconName = 'ellipsis-horizontal-circle-sharp';
112112
}

android/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- Update the version number in android/app/build.gradle
44
- Test the version on a simulator
5-
- `npx react-native run-android --no-jetifier --variant=release`
5+
- `npx react-native run-android --mode release`
66
- Create the Google Play Build
77
- `./gradlew bundleRelease`
88
- outputs to android/app/build/outputs/bundle/release/app-release.aab

android/app/build.gradle

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ android {
8282
applicationId "com.scalepractice"
8383
minSdkVersion rootProject.ext.minSdkVersion
8484
targetSdkVersion rootProject.ext.targetSdkVersion
85-
versionCode 8
86-
versionName "2.7.3"
85+
versionCode 9
86+
versionName "2.8.0"
8787
}
8888
signingConfigs {
8989
debug {
@@ -92,6 +92,14 @@ android {
9292
keyAlias 'androiddebugkey'
9393
keyPassword 'android'
9494
}
95+
release {
96+
if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
97+
storeFile file(MYAPP_UPLOAD_STORE_FILE)
98+
storePassword MYAPP_UPLOAD_STORE_PASSWORD
99+
keyAlias MYAPP_UPLOAD_KEY_ALIAS
100+
keyPassword MYAPP_UPLOAD_KEY_PASSWORD
101+
}
102+
}
95103
}
96104
buildTypes {
97105
debug {
@@ -100,7 +108,7 @@ android {
100108
release {
101109
// Caution! In production, you need to generate your own keystore file.
102110
// see https://reactnative.dev/docs/signed-apk-android.
103-
signingConfig signingConfigs.debug
111+
signingConfig signingConfigs.release
104112
minifyEnabled enableProguardInReleaseBuilds
105113
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
106114
}
@@ -118,4 +126,4 @@ dependencies {
118126
}
119127
}
120128

121-
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
129+
apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")

ios/ScalePractice.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -866,13 +866,13 @@
866866
buildSettings = {
867867
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
868868
CLANG_ENABLE_MODULES = YES;
869-
CURRENT_PROJECT_VERSION = 2.7.2;
869+
CURRENT_PROJECT_VERSION = 2.8.0;
870870
DEVELOPMENT_TEAM = L4SN53B3F6;
871871
ENABLE_BITCODE = NO;
872872
INFOPLIST_FILE = ScalePractice/Info.plist;
873873
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
874874
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
875-
MARKETING_VERSION = 2.7.2;
875+
MARKETING_VERSION = 2.8.0;
876876
ONLY_ACTIVE_ARCH = YES;
877877
OTHER_LDFLAGS = (
878878
"$(inherited)",
@@ -894,12 +894,12 @@
894894
buildSettings = {
895895
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
896896
CLANG_ENABLE_MODULES = YES;
897-
CURRENT_PROJECT_VERSION = 2.7.2;
897+
CURRENT_PROJECT_VERSION = 2.8.0;
898898
DEVELOPMENT_TEAM = L4SN53B3F6;
899899
INFOPLIST_FILE = ScalePractice/Info.plist;
900900
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
901901
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
902-
MARKETING_VERSION = 2.7.2;
902+
MARKETING_VERSION = 2.8.0;
903903
ONLY_ACTIVE_ARCH = NO;
904904
OTHER_LDFLAGS = (
905905
"$(inherited)",
@@ -1067,7 +1067,7 @@
10671067
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
10681068
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
10691069
CODE_SIGN_STYLE = Automatic;
1070-
CURRENT_PROJECT_VERSION = 2.7.2;
1070+
CURRENT_PROJECT_VERSION = 2.8.0;
10711071
DEBUG_INFORMATION_FORMAT = dwarf;
10721072
DEVELOPMENT_TEAM = L4SN53B3F6;
10731073
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1103,7 +1103,7 @@
11031103
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11041104
CODE_SIGN_STYLE = Automatic;
11051105
COPY_PHASE_STRIP = NO;
1106-
CURRENT_PROJECT_VERSION = 2.7.2;
1106+
CURRENT_PROJECT_VERSION = 2.8.0;
11071107
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11081108
DEVELOPMENT_TEAM = L4SN53B3F6;
11091109
GCC_C_LANGUAGE_STANDARD = gnu11;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"react-native-reanimated": "3.16.1",
3737
"react-native-safe-area-context": "^4.4.1",
3838
"react-native-screens": "^3.18.2",
39-
"react-native-vector-icons": "^9.2.0"
39+
"react-native-vector-icons": "10.2.0"
4040
},
4141
"devDependencies": {
4242
"@babel/core": "^7.25.2",

yarn.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8529,16 +8529,18 @@ __metadata:
85298529
languageName: node
85308530
linkType: hard
85318531

8532-
"react-native-vector-icons@npm:^9.2.0":
8533-
version: 9.2.0
8534-
resolution: "react-native-vector-icons@npm:9.2.0"
8532+
"react-native-vector-icons@npm:10.2.0":
8533+
version: 10.2.0
8534+
resolution: "react-native-vector-icons@npm:10.2.0"
85358535
dependencies:
85368536
prop-types: ^15.7.2
85378537
yargs: ^16.1.1
85388538
bin:
8539+
fa-upgrade.sh: bin/fa-upgrade.sh
85398540
fa5-upgrade: bin/fa5-upgrade.sh
8541+
fa6-upgrade: bin/fa6-upgrade.sh
85408542
generate-icon: bin/generate-icon.js
8541-
checksum: 222baf88c3f269234c08a41680e6400a4bf1f4c170f7c2ffac34b2c1c089cdb1084223db2a7d9cc54ee212eec20ff1478f3f482df19062e3057c328642da0be2
8543+
checksum: fda930df4e63f12533268f5b339ebe4c77c691eae43503328466b3087ed868a06a4593fd246e75ac6b5ec955543eec35608c7922191bdcc3b3a94ed7f3575ef0
85428544
languageName: node
85438545
linkType: hard
85448546

@@ -9080,7 +9082,7 @@ __metadata:
90809082
react-native-reanimated: 3.16.1
90819083
react-native-safe-area-context: ^4.4.1
90829084
react-native-screens: ^3.18.2
9083-
react-native-vector-icons: ^9.2.0
9085+
react-native-vector-icons: 10.2.0
90849086
react-test-renderer: 18.3.1
90859087
typescript: 5.0.4
90869088
ua-parser-js: 0.7.33

0 commit comments

Comments
 (0)