Skip to content

Commit

Permalink
Merge pull request #323 from velocitycareerlabs/deps-upgrade-v2.6.14
Browse files Browse the repository at this point in the history
chore: deps upgrade v2.6.14
  • Loading branch information
michaelavoyan authored Jan 12, 2025
2 parents 4f8f918 + 013e330 commit 48a1645
Show file tree
Hide file tree
Showing 10 changed files with 739 additions and 666 deletions.
201 changes: 99 additions & 102 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,106 +1,103 @@
module.exports = {
root: true,
extends: [
'@react-native',
'airbnb',
'airbnb/hooks',
'airbnb-typescript',
'prettier',
"plugin:@typescript-eslint/recommended"
root: true,
extends: [
'@react-native',
'airbnb',
'airbnb/hooks',
'airbnb-typescript',
'prettier',
"plugin:@typescript-eslint/recommended"
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: './tsconfig.json'
},
plugins: [
'@typescript-eslint',
'prettier',
'prefer-arrow',
'autofix',
'unused-imports'
],
settings: {
'import/resolver': {
node: {
extensions: ['.js', '.jsx', '.ts', '.tsx'],
paths: ['./']
}
}
},
env: {
es6: true
},
rules: {
"no-console": "off",
"@typescript-eslint/lines-between-class-members": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-useless-constructor": "off",
"@typescript-eslint/no-throw-literal": "off",
'unused-imports/no-unused-vars-ts': [
'warn',
{
vars: 'all',
varsIgnorePattern: '^_',
args: 'after-used',
argsIgnorePattern: '^_'
}
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: './tsconfig.json'
},
plugins: [
'@typescript-eslint',
'prettier',
'prefer-arrow-functions',
'autofix',
'unused-imports'
'autofix/no-debugger': 'error',
'prefer-destructuring': [
'error',
{
array: false,
object: true
},
{
enforceForRenamedProperties: false
}
],
settings: {
'import/resolver': {
node: {
extensions: ['.js', '.jsx', '.ts', '.tsx'],
paths: ['./']
}
}
},
env: {
es6: true
},
rules: {
"no-console": "off",
"@typescript-eslint/lines-between-class-members": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-useless-constructor": "off",
"@typescript-eslint/no-throw-literal": "off",
'unused-imports/no-unused-vars-ts': [
'warn',
{
vars: 'all',
varsIgnorePattern: '^_',
args: 'after-used',
argsIgnorePattern: '^_'
}
],
'autofix/no-debugger': 'error',
'prefer-destructuring': [
'error',
{
array: false,
object: true
},
{
enforceForRenamedProperties: false
}
],
'prefer-arrow-functions/prefer-arrow-functions': [
'warn',
{
classPropertiesAllowed: false,
disallowPrototype: false,
returnStyle: 'unchanged',
singleReturnOnly: false
}
],
'react/prop-types': 0,
'import/prefer-default-export': 0,
'react/jsx-props-no-spreading': 0,
'no-underscore-dangle': 0,
'@typescript-eslint/no-use-before-define': [
'error',
{variables: false, classes: true, functions: true}
],
'no-param-reassign': 0,
'no-underscore-dangle': [
'error',
{allowAfterThis: true, allow: ['_id']}
],
quotes: [2, 'single', {avoidEscape: true}],
'no-use-before-define': 0,
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: [
'storybook/**',
'storybook/**/**/**',
'stories/**'
]
}
],
'global-require': 0,
'react/require-default-props': 'off',
'react/prop-types': 'off',
'react/function-component-definition': 'off',
'react/no-unstable-nested-components': 'off',
'react/jsx-no-useless-fragment': 'off',
'prettier/prettier': 'off',
'arrow-body-style': 'off',
'no-promise-executor-return': 'off',
'@typescript-eslint/default-param-last': 'off',
'@typescript-eslint/naming-convention': 'off',
'@typescript-eslint/return-await': 'off'
}
'prefer-arrow/prefer-arrow-functions': [
"warn",
{
"disallowPrototype": true,
"singleReturnOnly": false,
"classPropertiesAllowed": false
}
],
'import/prefer-default-export': 0,
'react/jsx-props-no-spreading': 0,
'@typescript-eslint/no-use-before-define': [
'error',
{ variables: false, classes: true, functions: true }
],
'no-param-reassign': 0,
'no-underscore-dangle': [
'error',
{ allowAfterThis: true, allow: ['_id'] }
],
quotes: [2, 'single', { avoidEscape: true }],
'no-use-before-define': 0,
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: [
'storybook/**',
'storybook/**/**/**',
'stories/**'
]
}
],
'global-require': 0,
'react/require-default-props': 'off',
'react/prop-types': 'off',
'react/function-component-definition': 'off',
'react/no-unstable-nested-components': 'off',
'react/jsx-no-useless-fragment': 'off',
'prettier/prettier': 'off',
'arrow-body-style': 'off',
'no-promise-executor-return': 'off',
'@typescript-eslint/default-param-last': 'off',
'@typescript-eslint/naming-convention': 'off',
'@typescript-eslint/return-await': 'off'
}
};
2 changes: 1 addition & 1 deletion .github/workflows/react-native-sdk.tests.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
RC_SUFFIX: 'rc'
jobs:
test-react-sdk:
runs-on: macos-14
runs-on: macos-15
steps:
# Git clone repository
- name: Git clone repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/react-native-sdk.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
GLOBAL_ENV: ${{ github.event_name == 'push' && format('{0}', 'dev') || inputs.environment }}
jobs:
build-react-native-sdk:
runs-on: macos-14
runs-on: macos-15
steps:
- name: Git clone repository
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

//--------- Must: be added:
implementation "io.velocitycareerlabs:vcl:2.6.12"
implementation 'com.nimbusds:nimbus-jose-jwt:9.45'
implementation "io.velocitycareerlabs:vcl:2.6.14"
implementation 'com.nimbusds:nimbus-jose-jwt:10.0.1'
implementation "androidx.security:security-crypto:1.1.0-alpha06"
//-------------------------
}
Expand Down
2 changes: 1 addition & 1 deletion example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ 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.16'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
gem 'activesupport', '>= 6.1.7.5', '< 7.2.3'
10 changes: 5 additions & 5 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,12 @@ PODS:
- React-logger (= 0.73.6)
- React-perflogger (= 0.73.6)
- SocketRocket (0.6.1)
- VCL (2.6.12)
- velocitycareerlabs-vcl-react-native (2.6.12):
- VCL (2.6.14)
- velocitycareerlabs-vcl-react-native (2.6.14):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- VCL (= 2.6.12)
- VCL (= 2.6.14)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1276,8 +1276,8 @@ SPEC CHECKSUMS:
React-utils: 288c9cb9a73bb150c273c84df7c2f8546f28e23f
ReactCommon: 2e5492a3e3a8e72d635c266405e49d12627e5bf0
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
VCL: c8ad7f70ce2c767a1a3d380df53ec55fafeef113
velocitycareerlabs-vcl-react-native: 85d45dfc59bbb5d53259f978db77a64d63e532c0
VCL: 733b44acfd727cb698d004200496191f70f21d4a
velocitycareerlabs-vcl-react-native: 0bf8f684f9eb01b265ebf11d47fb802c06893a64
Yoga: 805bf71192903b20fc14babe48080582fee65a80

PODFILE CHECKSUM: b019a9f171e06cc915918d81c74115c30ea1b65c
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@babel/runtime": "^7.20.0",
"@react-native/babel-preset": "0.74.75",
"@react-native/metro-config": "0.74.75",
"@react-native/typescript-config": "0.74.0",
"@react-native/typescript-config": "0.76.1",
"babel-plugin-module-resolver": "^5.0.0"
},
"engines": {
Expand Down
17 changes: 6 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@velocitycareerlabs/vcl-react-native",
"version": "2.6.12",
"version": "2.6.14",
"description": "Velocity Career Labs React Native SDK",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down Expand Up @@ -60,8 +60,8 @@
"@evilmartians/lefthook": "^1.5.0",
"@react-native/eslint-config": "^0.74.75",
"@release-it/conventional-changelog": "^8.0.1",
"@types/jest": "^29.5.5",
"@types/react": "^18.2.44",
"@types/jest": "^29.5.14",
"@types/react": "^18.3.12",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"commitlint": "^19.1.0",
"del-cli": "^5.1.0",
Expand All @@ -75,7 +75,7 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^28.2.0",
"eslint-plugin-jsx-a11y": "^6.8.0 ",
"eslint-plugin-prefer-arrow-functions": "^3.3.2",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
Expand All @@ -85,13 +85,13 @@
"prettier": "^3.0.3",
"react": "18.3.1",
"react-native": "0.73.6",
"react-native-builder-bob": "^0.23.2",
"react-native-builder-bob": "^0.30.0",
"release-it": "^15.0.0",
"turbo": "^1.10.7",
"typescript": "^5.2.2"
},
"resolutions": {
"@types/react": "^18.2.44"
"@types/react": "^18.3.12"
},
"peerDependencies": {
"react": "*",
Expand Down Expand Up @@ -122,11 +122,6 @@
},
"github": {
"release": true
},
"plugins": {
"@release-it/conventional-changelog": {
"preset": "angular"
}
}
},
"eslintConfig": {
Expand Down
2 changes: 1 addition & 1 deletion velocitycareerlabs-vcl-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pod::Spec.new do |s|

# s.swift_version = "5"

s.dependency "VCL", "2.6.12"
s.dependency "VCL", "2.6.14"

# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
Expand Down
Loading

0 comments on commit 48a1645

Please sign in to comment.