Skip to content

Commit 82f19ce

Browse files
committed
Merge remote-tracking branch 'origin/main' into pre/v9-combined-testing
2 parents 513d669 + 236be5c commit 82f19ce

File tree

5 files changed

+156
-3
lines changed

5 files changed

+156
-3
lines changed

.github/workflows/codeql.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
pull_request:
7+
branches: ["main"]
8+
schedule:
9+
- cron: "0 0 * * 1"
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
analyze:
16+
name: Analyze
17+
runs-on: ubuntu-latest
18+
permissions:
19+
actions: read
20+
contents: read
21+
security-events: write
22+
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
language: ["javascript", "typescript"]
27+
# CodeQL supports [ $supported-codeql-languages ]
28+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
29+
30+
steps:
31+
32+
- name: Checkout repository
33+
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
34+
35+
# Initializes the CodeQL tools for scanning.
36+
- name: Initialize CodeQL
37+
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
38+
with:
39+
languages: ${{ matrix.language }}
40+
# If you wish to specify custom queries, you can do so here or in a config file.
41+
# By default, queries listed here will override any specified in a config file.
42+
# Prefix the list here with "+" to use these queries and those in the config file.
43+
44+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
45+
# If this step fails, then you should remove it and run the build manually (see below)
46+
- name: Autobuild
47+
uses: github/codeql-action/autobuild@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
48+
49+
# ℹ️ Command-line programs to run using the OS shell.
50+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
51+
52+
# If the Autobuild fails above, remove it and uncomment the following three lines.
53+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
54+
55+
# - run: |
56+
# echo "Run, Build Application using script"
57+
# ./location_of_script_within_repo/buildscript.sh
58+
59+
- name: Perform CodeQL Analysis
60+
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
61+
with:
62+
category: "/language:${{matrix.language}}"

.github/workflows/npm_release_cli.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,20 @@ on:
1010
env:
1111
NPM_TAG: 'next'
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
release:
1518
runs-on: macos-latest
1619

1720
steps:
21+
22+
- name: Harden the runner (Audit all outbound calls)
23+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
24+
with:
25+
egress-policy: audit
26+
1827
- uses: actions/checkout@v2
1928

2029
- uses: actions/setup-node@v3

.github/workflows/npm_release_doctor.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ defaults:
1414
env:
1515
NPM_TAG: 'next'
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
release:
1922
runs-on: ubuntu-latest
2023

2124
steps:
25+
26+
- name: Harden the runner (Audit all outbound calls)
27+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
28+
with:
29+
egress-policy: audit
30+
2231
- uses: actions/checkout@v2
2332

2433
- name: Setup

.github/workflows/scorecard.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Scorecard supply-chain security
2+
on:
3+
# For Branch-Protection check. Only the default branch is supported. See
4+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
5+
branch_protection_rule:
6+
# To guarantee Maintained check is occasionally updated. See
7+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
8+
schedule:
9+
- cron: '20 7 * * 2'
10+
push:
11+
branches: ["main"]
12+
13+
# Declare default permissions as read only.
14+
permissions: read-all
15+
16+
jobs:
17+
analysis:
18+
name: Scorecard analysis
19+
runs-on: ubuntu-latest
20+
permissions:
21+
# Needed to upload the results to code-scanning dashboard.
22+
security-events: write
23+
# Needed to publish results and get a badge (see publish_results below).
24+
id-token: write
25+
contents: read
26+
actions: read
27+
# To allow GraphQL ListCommits to work
28+
issues: read
29+
pull-requests: read
30+
# To detect SAST tools
31+
checks: read
32+
33+
steps:
34+
35+
- name: "Checkout code"
36+
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
37+
with:
38+
persist-credentials: false
39+
40+
- name: "Run analysis"
41+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
42+
with:
43+
results_file: results.sarif
44+
results_format: sarif
45+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
46+
# - you want to enable the Branch-Protection check on a *public* repository, or
47+
# - you are installing Scorecards on a *private* repository
48+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
49+
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
50+
51+
# Public repositories:
52+
# - Publish results to OpenSSF REST API for easy access by consumers
53+
# - Allows the repository to include the Scorecard badge.
54+
# - See https://github.com/ossf/scorecard-action#publishing-results.
55+
# For private repositories:
56+
# - `publish_results` will always be set to `false`, regardless
57+
# of the value entered here.
58+
publish_results: true
59+
60+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
61+
# format to the repository Actions tab.
62+
- name: "Upload artifact"
63+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
64+
with:
65+
name: SARIF file
66+
path: results.sarif
67+
retention-days: 5
68+
69+
# Upload the results to GitHub's code scanning dashboard.
70+
- name: "Upload to code-scanning"
71+
uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
72+
with:
73+
sarif_file: results.sarif

vendor/gradle-plugin/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ allprojects {
159159
}
160160

161161

162-
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 34 }
163-
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 34 as int }
162+
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 35 }
163+
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 35 as int }
164164
def computeBuildToolsVersion = { ->
165-
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "34.0.0"
165+
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "35.0.1"
166166
}
167167

168168
android {

0 commit comments

Comments
 (0)