Skip to content

Commit

Permalink
chore: update project dependencies (#360)
Browse files Browse the repository at this point in the history
* ci(rudder-sdk-react-native-monorepo): update the cocopod version to 1.5.2 in test.yml

* chore: set default node version to 20.0.0

It is required by the different modules

* chore(rudder-sdk-react-native-monorepo): update react-native and other nx packages to the latest version

* chore(rudder-sdk-react-native-monorepo): remove storybook package to address various issues

This will remove the ip package and address snyk and npm security issues

* Revert "chore(rudder-sdk-react-native-monorepo): remove storybook package to address various issues"

This reverts commit 31ff650.

* chore(rudder-sdk-react-native-monorepo): remove storybook package to address various issues

This will remove the ip package and address snyk and npm security issues

* chore(rudder-sdk-react-native-monorepo): update sample app

* chore(example): update sample app

This is necessary to fix the build issue in Android and iOS

* chore(rudder-sdk-react-native-monorepo): fix peer dependency issue

* chore(rudder-sdk-react-native-monorepo): fix deprecated packages

* chore(rudder-sdk-react-native-monorepo): revert package.json changes

* chore(rudder-sdk-react-native-monorepo): reinstall madge package

It is required to check the circular dependencies

* Revert "chore(rudder-sdk-react-native-monorepo): reinstall madge package"

This reverts commit a3acf1d.

* chore(rudder-sdk-react-native-monorepo): remove circular dependency check

Required to solve the requirejs related npm security issue.

* ci: remove circular check

* chore(example): update ios project

* chore(example): revert yoga related changes in the Podfile

* chore(rudder-sdk-react-native-monorepo): again add @digitalroute/cz-conventional-changelog-for-jira in package.json

* chore(rudder-sdk-react-native-monorepo): remove stale overrides

* chore(rudder-sdk-react-native-monorepo): remove migrations.json file

* chore(rudder-sdk-react-native-monorepo): add migrations.json in .gitignore

* chore(rudder-sdk-react-native-monorepo): update node version to 20.15.1 in .nvmrc file

* chore(rudder-sdk-react-native-monorepo): update package-lock.json file

* ci: remove commented out code

* chore(rudder-sdk-react-native-monorepo): address new npm security issues caused due to node bump

* ci: use different action to setup cocoapod in test.yml

Also update the ruby-version to 3.3.2

* chore(rudder-sdk-react-native-monorepo): bump the patch version for git-raw-commit

This is required to fix the nx affected command whcih generates the changelog

* chore(rudder-sdk-react-native-monorepo): override few packages to address the medium level vulnerabilities

* chore(example): address comment
  • Loading branch information
1abhishekpandey authored Jul 18, 2024
1 parent 5e83991 commit dfdf3dc
Show file tree
Hide file tree
Showing 27 changed files with 20,671 additions and 53,721 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build-and-quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
run: |
npm run setup:ci
- name: Execute quality checks
run: |
npm run check:circular
- name: Execute security checks
run: |
npm run check:security
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.2'

- name: Setup CocoaPods
uses: maxim-lobanov/setup-cocoapods@v1
with:
version: 1.14.3
uses: NiftyStack/[email protected]

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,7 @@ buck-out/
apps/example-e2e/artifacts

.nx/cache
.nx/workspace-data

storybook-static
storybook-static
migrations.json
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.11.0
20.15.1
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ gradlew*
*.xcodeproj/
*.xcworkspace/
Pods/
/.nx/cache
/.nx/cache
/.nx/workspace-data
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"nrwl.angular-console",
"esbenp.prettier-vscode",
"firsttris.vscode-jest-runner",
"dbaeumer.vscode-eslint"
"dbaeumer.vscode-eslint",
"ms-playwright.playwright"
]
}
6 changes: 4 additions & 2 deletions apps/example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
# 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'
1 change: 0 additions & 1 deletion apps/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ 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 Down
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
import com.moengage.core.LogLevel
import com.moengage.core.MoEngage
Expand All @@ -34,7 +33,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 @@ -43,8 +42,7 @@ 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)

// Needed to initialise the MoEngage SDK:
if (!BuildConfig.MOENGAGE_ANDROID_APP_ID.isEmpty()) {
val moEngage = MoEngage.Builder(this, BuildConfig.MOENGAGE_ANDROID_APP_ID)
.configureLogs(LogConfig(LogLevel.VERBOSE, false))
Expand Down
8 changes: 4 additions & 4 deletions apps/example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 21
minSdkVersion = 23
compileSdkVersion = 34
targetSdkVersion = 34
ndkVersion = "25.1.8937393"
kotlinVersion = "1.8.22"
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.22"
}
repositories {
google()
Expand All @@ -14,7 +14,7 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions apps/example/android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions apps/example/android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Loading

0 comments on commit dfdf3dc

Please sign in to comment.