Skip to content

Commit 861e280

Browse files
dependabot[bot]kriptoburak
andauthored
build: update Gradle and patch SDK dependency vulnerabilities (#52)
* chore(deps): bump gradle-wrapper from 9.6.1 to 9.7.0 Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.6.1 to 9.7.0. - [Release notes](https://github.com/gradle/gradle/releases) - [Commits](gradle/gradle@v9.6.1...v9.7.0) --- updated-dependencies: - dependency-name: gradle-wrapper dependency-version: 9.7.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: patch SDK dependency vulnerabilities * build: fix Kotlin toolchain vulnerability --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kriptoburak <kriptoburak@users.noreply.github.com>
1 parent 462b406 commit 861e280

18 files changed

Lines changed: 587 additions & 740 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
cache-cleanup: always
4242

4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
44+
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4545
with:
4646
languages: java-kotlin
4747
build-mode: manual
4848
queries: security-extended
4949

5050
- name: Build analyzed sources
51-
run: ./gradlew clean classes --no-daemon --no-build-cache
51+
run: sed -i 's/2.4.20-Beta2/2.4.10/g' buildSrc/build.gradle.kts ./*/gradle.lockfile && ./gradlew clean classes --write-verification-metadata sha256 --no-daemon --no-build-cache
5252

5353
- name: Analyze
54-
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
54+
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
retention-days: 5
4343

4444
- name: Upload to code scanning
45-
uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
45+
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4646
with:
4747
sarif_file: results.sarif

build.gradle.kts

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ allprojects {
5858
"org.apache.commons:commons-lang3:3.20.0",
5959
"org.apache.logging.log4j:log4j-api:2.26.1",
6060
"org.apache.logging.log4j:log4j-core:2.26.1",
61+
"org.apache.httpcomponents.client5:httpclient5:5.6.4",
62+
"org.apache.httpcomponents.core5:httpcore5:5.4.3",
63+
"org.apache.httpcomponents.core5:httpcore5-h2:5.4.3",
6164
"org.jsoup:jsoup:1.23.1",
6265
"org.xmlunit:xmlunit-core:2.13.0",
6366
"org.xmlunit:xmlunit-legacy:2.13.0",
@@ -82,19 +85,25 @@ val coverageExecutionData =
8285
fileTree(rootDir) {
8386
include("x-twitter-scraper-java*/build/jacoco/test.exec")
8487
}
88+
val coverageProjects =
89+
subprojects.filterNot { it.name == "x-twitter-scraper-java-proguard-test" }
8590
val allCoverageClasses =
86-
fileTree(rootDir) {
87-
include("x-twitter-scraper-java*/build/classes/java/main/**/*.class")
88-
include("x-twitter-scraper-java*/build/classes/kotlin/main/**/*.class")
89-
}
91+
files(
92+
coverageProjects.flatMap { project ->
93+
listOf(
94+
project.layout.buildDirectory.dir("classes/java/main"),
95+
project.layout.buildDirectory.dir("classes/kotlin/main"),
96+
)
97+
}
98+
)
9099
val generatedSourceHeaderPrefix = "// File generated from our OpenAPI spec"
91100
val generatedSourceHeaderLineLimit = 12
92101
val maintainedGeneratedSources =
93102
setOf(
94103
"x-twitter-scraper-java-core/src/main/kotlin/com/x_twitter_scraper/api/core/http/RetryingHttpClient.kt"
95104
)
96105
val generatedCoverageExclusions =
97-
subprojects.associateWith { project ->
106+
coverageProjects.associateWith { project ->
98107
listOf("src/main/java", "src/main/kotlin").flatMap { sourcePath ->
99108
val sourceRoot = project.file(sourcePath)
100109
if (!sourceRoot.isDirectory) {
@@ -124,7 +133,7 @@ val generatedCoverageExclusions =
124133
}
125134
val maintainedCoverageClasses =
126135
files(
127-
subprojects.flatMap { project ->
136+
coverageProjects.flatMap { project ->
128137
val exclusions = generatedCoverageExclusions.getValue(project)
129138
listOf(
130139
project.fileTree(project.layout.buildDirectory.dir("classes/java/main")) {
@@ -138,17 +147,15 @@ val maintainedCoverageClasses =
138147
)
139148
val coverageSources =
140149
files(
141-
subprojects.flatMap { project ->
150+
coverageProjects.flatMap { project ->
142151
listOf(
143152
project.layout.projectDirectory.dir("src/main/java"),
144153
project.layout.projectDirectory.dir("src/main/kotlin"),
145154
)
146155
}
147156
)
148157
val testTasks =
149-
subprojects
150-
.filterNot { it.name == "x-twitter-scraper-java-proguard-test" }
151-
.map { "${it.path}:test" }
158+
coverageProjects.map { "${it.path}:test" }
152159

153160
val coverageReport =
154161
tasks.register<JacocoReport>("coverageReport") {

buildSrc/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
66

7+
buildscript {
8+
configurations.classpath {
9+
resolutionStrategy.force("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.20-Beta2")
10+
}
11+
}
12+
713
plugins {
814
`kotlin-dsl`
915
}
@@ -53,6 +59,6 @@ configurations.configureEach {
5359

5460
dependencies {
5561
implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.2.0")
56-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0")
62+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.20-Beta2")
5763
implementation("com.vanniktech:gradle-maven-publish-plugin:0.37.0")
5864
}

0 commit comments

Comments
 (0)