Skip to content

Commit 8dc0000

Browse files
authored
Merge branch 'master' into fix/SDK-478-bridge-resolve-immediately
2 parents eb3c496 + 17c961f commit 8dc0000

16 files changed

Lines changed: 515 additions & 489 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL Advanced"
132

143
on:
154
push:
165
branches: [ "master" ]
176
pull_request:
187
branches: [ "master" ]
8+
schedule:
9+
- cron: '0 0 * * 1' # Runs every Monday at midnight, this is to ensure that there is at least 1 scan every 7 days.
10+
11+
workflow_dispatch:
12+
inputs:
13+
pr_id:
14+
description: 'Pull Request ID'
15+
required: true
16+
type: string
17+
18+
concurrency:
19+
group: codeql-${{ github.ref }}
20+
cancel-in-progress: true
1921

2022
jobs:
2123
Analyze_Ruby_JSandTS:
2224
name: Analyze (${{ matrix.language }})
23-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
25+
runs-on: ubuntu-latest
2426
permissions:
2527
# required for all workflows
2628
security-events: write
@@ -46,21 +48,12 @@ jobs:
4648
- name: Checkout repository
4749
uses: actions/checkout@v4
4850

49-
# Add any setup steps before running the `github/codeql-action/init` action.
50-
# This includes steps like installing compilers or runtimes (`actions/setup-node`
51-
# or others). This is typically only required for manual builds.
52-
# - name: Setup runtime (example)
53-
# uses: actions/setup-example@v1
54-
5551
# Initializes the CodeQL tools for scanning.
5652
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@v3
53+
uses: github/codeql-action/init@v4
5854
with:
5955
languages: ${{ matrix.language }}
6056
build-mode: ${{ matrix.build-mode }}
61-
# If you wish to specify custom queries, you can do so here or in a config file.
62-
# By default, queries listed here will override any specified in a config file.
63-
# Prefix the list here with "+" to use these queries and those in the config file.
6457

6558
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
6659
queries: ${{ matrix.language && 'security-extended, security-and-quality' }}
@@ -75,7 +68,7 @@ jobs:
7568
echo ' make release'
7669
exit 1
7770
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v3
71+
uses: github/codeql-action/analyze@v4
7972
with:
8073
category: "/language:${{matrix.language}}"
8174

@@ -106,18 +99,18 @@ jobs:
10699
- name: Checkout repository
107100
uses: actions/checkout@v4
108101

109-
# Add any setup steps before running the `github/codeql-action/init` action.
110-
# This includes steps like installing compilers or runtimes (`actions/setup-node`
111-
# or others). This is typically only required for manual builds.
112-
# - name: Setup runtime (example)
113-
# uses: actions/setup-example@v1
102+
- name: Setup Node.js
103+
uses: actions/setup-node@v4
104+
with:
105+
node-version: '24'
114106

115-
- name: Setup
116-
uses: ./.github/actions/setup
107+
- name: Install Dependencies
108+
run: |
109+
yarn install
117110
118111
- name: Install JDK
119112
if: env.turbo_cache_hit != 1
120-
uses: actions/setup-java@v3
113+
uses: actions/setup-java@v4
121114
with:
122115
distribution: 'zulu'
123116
java-version: '17'
@@ -129,13 +122,10 @@ jobs:
129122
130123
# Initializes the CodeQL tools for scanning.
131124
- name: Initialize CodeQL
132-
uses: github/codeql-action/init@v3
125+
uses: github/codeql-action/init@v4
133126
with:
134127
languages: ${{ matrix.language }}
135128
build-mode: ${{ matrix.build-mode }}
136-
# If you wish to specify custom queries, you can do so here or in a config file.
137-
# By default, queries listed here will override any specified in a config file.
138-
# Prefix the list here with "+" to use these queries and those in the config file.
139129

140130
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
141131
queries: ${{ matrix.language && 'security-extended, security-and-quality' }}
@@ -149,7 +139,7 @@ jobs:
149139
./gradlew clean
150140
151141
- name: Perform CodeQL Analysis
152-
uses: github/codeql-action/analyze@v3
142+
uses: github/codeql-action/analyze@v4
153143
with:
154144
category: "/language:${{matrix.language}}"
155145

@@ -187,7 +177,7 @@ jobs:
187177

188178
# Initializes the CodeQL tools for scanning.
189179
- name: Initialize CodeQL
190-
uses: github/codeql-action/init@v3
180+
uses: github/codeql-action/init@v4
191181
with:
192182
languages: ${{ matrix.language }}
193183
build-mode: ${{ matrix.build-mode }}
@@ -209,6 +199,6 @@ jobs:
209199
xcodebuild -workspace ReactNativeSdkExample.xcworkspace -scheme ReactNativeSdkExample -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 16' build
210200
211201
- name: Perform CodeQL Analysis
212-
uses: github/codeql-action/analyze@v3
202+
uses: github/codeql-action/analyze@v4
213203
with:
214204
category: "/language:${{matrix.language}}"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.19.4
1+
v22.14.0

example/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ gem 'bigdecimal'
1414
gem 'logger'
1515
gem 'benchmark'
1616
gem 'mutex_m'
17+
gem 'nkf'

example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ react {
1919

2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to
22-
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
22+
// skip the bundling of the JS bundle and the assets. Default is "debug", "debugOptimized".
2323
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
24-
// debuggableVariants = ["liteDebug", "prodDebug"]
24+
// debuggableVariants = ["liteDebug", "liteDebugOptimized", "prodDebug", "prodDebugOptimized"]
2525

2626
/* Bundling */
2727
// A list containing the node command and its flags. Default is just 'node'.
718 Bytes
Binary file not shown.

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

example/android/gradlew

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/android/gradlew.bat

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)