Skip to content

Commit

Permalink
Merge pull request #5 from nicolas-meilan/chore/upgrade-rn-75
Browse files Browse the repository at this point in the history
Chore/upgrade rn 75
  • Loading branch information
nicolas-meilan authored Sep 23, 2024
2 parents d0f3773 + 5e6f89b commit 0dc75a8
Show file tree
Hide file tree
Showing 58 changed files with 16,181 additions and 18,089 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ WEB3_TRON_PROVIDER_VENDOR=
WEB3_TRON_TESTNET_PROVIDER_VENDOR=
WEB3_TRON_PROVIDER_VENDOR_KEY=
HTTP_ETH_BLOCKCHAIN_INFO_PROVIDER_VENDOR_KEY=
HTTP_ARBITRUM_BLOCKCHAIN_INFO_PROVIDER_VENDOR_KEY=
HTTP_POLYGON_BLOCKCHAIN_INFO_PROVIDER_VENDOR_KEY=
HTTP_BSC_BLOCKCHAIN_INFO_PROVIDER_VENDOR_KEY=
HTTP_TRON_BLOCKCHAIN_INFO_PROVIDER_VENDOR_KEY=
Expand Down
146 changes: 0 additions & 146 deletions .eslintrc.json

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ jobs:
distribution: 'zulu'
java-version: 17.0.9

- name: Install App center
run: npm install -g appcenter-cli
- name: Set up JS global packages
run: |
corepack enable
npm install -g appcenter-cli
- name: Obtain config
uses: actions/checkout@v3
Expand All @@ -39,7 +41,7 @@ jobs:
run: mv ./app-configuration/.env.${{ github.event.inputs.environment }} ./.env

- name: Install dependencies
run: npm install
run: yarn install

- name: Build android
run: npm run build-android-release
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/onRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
distribution: 'zulu'
java-version: 17.0.9

- name: Install App center
run: npm install -g appcenter-cli
- name: Set up JS global packages
run: |
corepack enable
npm install -g appcenter-cli
- name: Obtain config
uses: actions/checkout@v3
Expand All @@ -32,7 +34,7 @@ jobs:
run: mv ./app-configuration/.env.production ./.env

- name: Install dependencies
run: npm install
run: yarn install

- name: Build android
run: npm run build-android-release
Expand Down
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local
**/.xcode.env.local

# Android/IntelliJ
#
Expand Down Expand Up @@ -56,7 +56,7 @@ yarn-error.log
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
**/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
Expand All @@ -70,4 +70,12 @@ app-configuration/
.eslintcache

# testing
/coverage
/coverage

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
7 changes: 0 additions & 7 deletions .prettierrc.js

This file was deleted.

28 changes: 28 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"extends": [
"stylelint-config-standard"
],
"customSyntax": "postcss-styled-syntax",
"plugins": [
"stylelint-order",
"stylelint-react-native"
],
"rules": {
"declaration-block-no-redundant-longhand-properties": null,
"property-no-unknown": [
true,
{
"ignoreProperties": [
"padding-vertical",
"padding-horizontal",
"margin-horizontal",
"margin-vertical",
"link-color",
"vertical-align",
"justify-self",
"place-self"
]
}
]
}
}
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
25 changes: 13 additions & 12 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ apply plugin: "com.facebook.react"
*/
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// codegenDir = file("../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")
// The root of your project, i.e. where "package.json" lives. Default is '../..'
// root = file("../../")
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
// reactNativeDir = file("../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
// codegenDir = file("../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
// cliFile = file("../../node_modules/react-native/cli.js")

/* Variants */
// The list of variants to that are debuggable. For those we're going to
Expand Down Expand Up @@ -49,6 +49,9 @@ react {
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]

/* Autolinking */
autolinkLibrariesWithApp()
entryFile = file("../../index.ts")
}

Expand Down Expand Up @@ -81,8 +84,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
resConfigs "en", "es"
versionCode 21
versionName "1.6.3"
versionCode 22
versionName "1.6.4"
}
signingConfigs {
release {
Expand Down Expand Up @@ -122,7 +125,6 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand All @@ -131,4 +133,3 @@ dependencies {
}
}
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:supportsRtl="true">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
Expand Down
4 changes: 1 addition & 3 deletions android/app/src/main/java/com/RungeCoin/MainApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.flipper.ReactNativeFlipper
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {
Expand All @@ -32,7 +31,7 @@ class MainApplication : Application(), ReactApplication {


override val reactHost: ReactHost
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
get() = getDefaultReactHost(applicationContext, reactNativeHost)

override fun onCreate() {
super.onCreate()
Expand All @@ -41,6 +40,5 @@ class MainApplication : Application(), ReactApplication {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
}
}
3 changes: 2 additions & 1 deletion android/app/src/main/res/drawable/rn_edit_text_material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
>

<selector>
<!--
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 23
minSdkVersion = 24
compileSdkVersion = 34
targetSdkVersion = 34
ndkVersion = "25.1.8937393"
kotlinVersion = "1.8.0" // react-native-webview
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.24" // react-native-webview
kotlin_version = "1.7.20" // react-native-camera-kit
}
repositories {
Expand Down
Loading

0 comments on commit 0dc75a8

Please sign in to comment.