Skip to content

Commit

Permalink
fix: Correct issues with RN Update for Android
Browse files Browse the repository at this point in the history
- Update React Native Vector Icons
- Update Android and some iOS version numbers
- Update icon names to new names in App.js
  • Loading branch information
aburdiss committed Dec 28, 2024
1 parent 56f5a64 commit 44dfd9d
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 20 deletions.
6 changes: 3 additions & 3 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ function getTabBarIcon(route) {
return ({ color, size }) => {
let iconName;
if (route.name === 'RandomStack') {
iconName = 'md-cube';
iconName = 'cube';
} else if (route.name === 'ResourcesStack') {
iconName = 'md-book';
iconName = 'book';
} else if (route.name === 'AdvancedStack') {
iconName = 'md-create';
iconName = 'create';
} else if (route.name === 'MoreStack') {
iconName = 'ellipsis-horizontal-circle-sharp';
}
Expand Down
2 changes: 1 addition & 1 deletion android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- Update the version number in android/app/build.gradle
- Test the version on a simulator
- `npx react-native run-android --no-jetifier --variant=release`
- `npx react-native run-android --mode release`
- Create the Google Play Build
- `./gradlew bundleRelease`
- outputs to android/app/build/outputs/bundle/release/app-release.aab
Expand Down
16 changes: 12 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ android {
applicationId "com.scalepractice"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 8
versionName "2.7.3"
versionCode 9
versionName "2.8.0"
}
signingConfigs {
debug {
Expand All @@ -92,6 +92,14 @@ android {
keyAlias 'androiddebugkey'
keyPassword 'android'
}
release {
if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
storeFile file(MYAPP_UPLOAD_STORE_FILE)
storePassword MYAPP_UPLOAD_STORE_PASSWORD
keyAlias MYAPP_UPLOAD_KEY_ALIAS
keyPassword MYAPP_UPLOAD_KEY_PASSWORD
}
}
}
buildTypes {
debug {
Expand All @@ -100,7 +108,7 @@ android {
release {
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
signingConfig signingConfigs.debug
signingConfig signingConfigs.release
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
Expand All @@ -118,4 +126,4 @@ dependencies {
}
}

apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
12 changes: 6 additions & 6 deletions ios/ScalePractice.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -866,13 +866,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2.7.2;
CURRENT_PROJECT_VERSION = 2.8.0;
DEVELOPMENT_TEAM = L4SN53B3F6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ScalePractice/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.7.2;
MARKETING_VERSION = 2.8.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -894,12 +894,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2.7.2;
CURRENT_PROJECT_VERSION = 2.8.0;
DEVELOPMENT_TEAM = L4SN53B3F6;
INFOPLIST_FILE = ScalePractice/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.7.2;
MARKETING_VERSION = 2.8.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1067,7 +1067,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.7.2;
CURRENT_PROJECT_VERSION = 2.8.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = L4SN53B3F6;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -1103,7 +1103,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.7.2;
CURRENT_PROJECT_VERSION = 2.8.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = L4SN53B3F6;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"react-native-reanimated": "3.16.1",
"react-native-safe-area-context": "^4.4.1",
"react-native-screens": "^3.18.2",
"react-native-vector-icons": "^9.2.0"
"react-native-vector-icons": "10.2.0"
},
"devDependencies": {
"@babel/core": "^7.25.2",
Expand Down
12 changes: 7 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8529,16 +8529,18 @@ __metadata:
languageName: node
linkType: hard

"react-native-vector-icons@npm:^9.2.0":
version: 9.2.0
resolution: "react-native-vector-icons@npm:9.2.0"
"react-native-vector-icons@npm:10.2.0":
version: 10.2.0
resolution: "react-native-vector-icons@npm:10.2.0"
dependencies:
prop-types: ^15.7.2
yargs: ^16.1.1
bin:
fa-upgrade.sh: bin/fa-upgrade.sh
fa5-upgrade: bin/fa5-upgrade.sh
fa6-upgrade: bin/fa6-upgrade.sh
generate-icon: bin/generate-icon.js
checksum: 222baf88c3f269234c08a41680e6400a4bf1f4c170f7c2ffac34b2c1c089cdb1084223db2a7d9cc54ee212eec20ff1478f3f482df19062e3057c328642da0be2
checksum: fda930df4e63f12533268f5b339ebe4c77c691eae43503328466b3087ed868a06a4593fd246e75ac6b5ec955543eec35608c7922191bdcc3b3a94ed7f3575ef0
languageName: node
linkType: hard

Expand Down Expand Up @@ -9080,7 +9082,7 @@ __metadata:
react-native-reanimated: 3.16.1
react-native-safe-area-context: ^4.4.1
react-native-screens: ^3.18.2
react-native-vector-icons: ^9.2.0
react-native-vector-icons: 10.2.0
react-test-renderer: 18.3.1
typescript: 5.0.4
ua-parser-js: 0.7.33
Expand Down

0 comments on commit 44dfd9d

Please sign in to comment.