Cleanup dependencies
* Remove the split between dependencies and dependencies_new
* Move all explicit Kotlin dependencies to 1.9.0
* Update Studio SDK dependencies to version 31.2.0-rc01
Bug: b/299065366
Change-Id: Ib6186ad32dd9ba753c128525446d5921f5e19074
diff --git a/.gitignore b/.gitignore
index 062fe33..8eab4b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,8 +91,6 @@
third_party/ddmlib.tar.gz
third_party/dependencies/
third_party/dependencies.tar.gz
-third_party/dependencies_new/
-third_party/dependencies_new.tar.gz
third_party/dependencies_plugin/
third_party/dependencies_plugin.tar.gz
third_party/desugar/desugar_*.tar.gz
diff --git a/d8_r8/commonBuildSrc/settings.gradle.kts b/d8_r8/commonBuildSrc/settings.gradle.kts
index f0a7aba..9180dc7 100644
--- a/d8_r8/commonBuildSrc/settings.gradle.kts
+++ b/d8_r8/commonBuildSrc/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 794e58e..f792379 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -315,7 +315,7 @@
const val guavaVersion = "32.1.2-jre"
const val javassist = "3.29.2-GA"
const val junitVersion = "4.13-beta-2"
- const val kotlinVersion = "1.8.10"
+ const val kotlinVersion = "1.9.0"
const val kotlinMetadataVersion = "0.7.0"
const val mockito = "2.10.0"
const val smaliVersion = "3.0.3"
diff --git a/d8_r8/keepanno/settings.gradle.kts b/d8_r8/keepanno/settings.gradle.kts
index 8159946..4b9b240 100644
--- a/d8_r8/keepanno/settings.gradle.kts
+++ b/d8_r8/keepanno/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/library_desugar/settings.gradle.kts b/d8_r8/library_desugar/settings.gradle.kts
index 642d900..02ff676 100644
--- a/d8_r8/library_desugar/settings.gradle.kts
+++ b/d8_r8/library_desugar/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/main/build.gradle.kts b/d8_r8/main/build.gradle.kts
index 47b5da0..3aeb083 100644
--- a/d8_r8/main/build.gradle.kts
+++ b/d8_r8/main/build.gradle.kts
@@ -107,11 +107,7 @@
fun getOriginJson() : java.nio.file.Path {
var repositoryDir =
moduleId.group.replace('.', '/') + "/" + moduleId.name + "/" + moduleId.version
- val path : Path =
- Paths.get("third_party", "dependencies", repositoryDir, "origin.json");
- val path_new : Path =
- Paths.get("third_party", "dependencies_new", repositoryDir, "origin.json");
- return if (path.exists()) path else path_new
+ return Paths.get("third_party", "dependencies", repositoryDir, "origin.json");
}
// Simple data model of the content of origin.json generated by the tool to download
diff --git a/d8_r8/main/settings.gradle.kts b/d8_r8/main/settings.gradle.kts
index d4f7ab8..f279f0b 100644
--- a/d8_r8/main/settings.gradle.kts
+++ b/d8_r8/main/settings.gradle.kts
@@ -8,7 +8,7 @@
url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/resourceshrinker/build.gradle.kts b/d8_r8/resourceshrinker/build.gradle.kts
index 750f076..c716378 100644
--- a/d8_r8/resourceshrinker/build.gradle.kts
+++ b/d8_r8/resourceshrinker/build.gradle.kts
@@ -36,9 +36,9 @@
compileOnly(files(resolve(ThirdPartyDeps.r8, "r8lib_8.2.20-dev.jar")))
implementation("com.android.tools.build:aapt2-proto:8.2.0-alpha10-10154469")
implementation("com.google.protobuf:protobuf-java:3.19.3")
- implementation("com.android.tools.layoutlib:layoutlib-api:31.2.0-alpha10")
- implementation("com.android.tools:common:31.2.0-alpha10")
- implementation("com.android.tools:sdk-common:31.2.0-alpha10")
+ implementation("com.android.tools.layoutlib:layoutlib-api:31.2.0-rc01")
+ implementation("com.android.tools:common:31.2.0-rc01")
+ implementation("com.android.tools:sdk-common:31.2.0-rc01")
}
tasks {
diff --git a/d8_r8/resourceshrinker/settings.gradle.kts b/d8_r8/resourceshrinker/settings.gradle.kts
index d879107..31a3ce7 100644
--- a/d8_r8/resourceshrinker/settings.gradle.kts
+++ b/d8_r8/resourceshrinker/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/settings.gradle.kts b/d8_r8/settings.gradle.kts
index ad7577f..03039c0 100644
--- a/d8_r8/settings.gradle.kts
+++ b/d8_r8/settings.gradle.kts
@@ -67,16 +67,15 @@
val thirdParty = getRepoRoot().resolve("third_party")
downloadFromGoogleStorage(thirdParty.resolve("dependencies"))
-downloadFromGoogleStorage(thirdParty.resolve("dependencies_new"))
downloadFromGoogleStorage(thirdParty.resolve("dependencies_plugin"))
pluginManagement {
repositories {
maven {
- url = uri("file:../third_party/dependencies")
+ url = uri("file:../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../third_party/dependencies_new")
+ url = uri("file:../third_party/dependencies")
}
}
includeBuild(rootProject.projectDir.resolve("commonBuildSrc"))
@@ -87,9 +86,6 @@
maven {
url = uri("file:../third_party/dependencies")
}
- maven {
- url = uri("file:../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/shared/settings.gradle.kts b/d8_r8/shared/settings.gradle.kts
index 0de348f..35918f8 100644
--- a/d8_r8/shared/settings.gradle.kts
+++ b/d8_r8/shared/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test/settings.gradle.kts b/d8_r8/test/settings.gradle.kts
index 375809a..38ba359 100644
--- a/d8_r8/test/settings.gradle.kts
+++ b/d8_r8/test/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../third_party/dependencies")
+ url = uri("file:../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../third_party/dependencies_new")
+ url = uri("file:../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../third_party/dependencies")
}
- maven {
- url = uri("file:../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts b/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
index cb05e4f..b4fb012 100644
--- a/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_10/settings.gradle.kts b/d8_r8/test_modules/tests_java_10/settings.gradle.kts
index d7b2f9a..c1ca87a 100644
--- a/d8_r8/test_modules/tests_java_10/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_10/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_11/settings.gradle.kts b/d8_r8/test_modules/tests_java_11/settings.gradle.kts
index 90fa823..98af16e 100644
--- a/d8_r8/test_modules/tests_java_11/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_11/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_17/settings.gradle.kts b/d8_r8/test_modules/tests_java_17/settings.gradle.kts
index fc53d30..c01f377 100644
--- a/d8_r8/test_modules/tests_java_17/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_17/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_20/settings.gradle.kts b/d8_r8/test_modules/tests_java_20/settings.gradle.kts
index 85d94d0..390fdb7 100644
--- a/d8_r8/test_modules/tests_java_20/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_20/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_8/settings.gradle.kts b/d8_r8/test_modules/tests_java_8/settings.gradle.kts
index a0cc31c..6600f09 100644
--- a/d8_r8/test_modules/tests_java_8/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/d8_r8/test_modules/tests_java_9/settings.gradle.kts b/d8_r8/test_modules/tests_java_9/settings.gradle.kts
index 46bc3a8..ad1c8ab 100644
--- a/d8_r8/test_modules/tests_java_9/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_9/settings.gradle.kts
@@ -5,10 +5,10 @@
pluginManagement {
repositories {
maven {
- url = uri("file:../../../third_party/dependencies")
+ url = uri("file:../../../third_party/dependencies_plugin")
}
maven {
- url = uri("file:../../../third_party/dependencies_new")
+ url = uri("file:../../../third_party/dependencies")
}
}
}
@@ -18,9 +18,6 @@
maven {
url = uri("file:../../../third_party/dependencies")
}
- maven {
- url = uri("file:../../../third_party/dependencies_new")
- }
}
}
diff --git a/third_party/dependencies.tar.gz.sha1 b/third_party/dependencies.tar.gz.sha1
index 8d3ba4e..9898030 100644
--- a/third_party/dependencies.tar.gz.sha1
+++ b/third_party/dependencies.tar.gz.sha1
@@ -1 +1 @@
-a8ce32b32965771099a4e91fedf13abfda7ffbed
+988112588dc40844879db1f2463433b7147d7263
\ No newline at end of file
diff --git a/third_party/dependencies_new.tar.gz.sha1 b/third_party/dependencies_new.tar.gz.sha1
deleted file mode 100644
index 01f988b..0000000
--- a/third_party/dependencies_new.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d5238791ca8a92b1ea3dcd91b013ef41e1b5ca38
diff --git a/third_party/dependencies_plugin.tar.gz.sha1 b/third_party/dependencies_plugin.tar.gz.sha1
index 08fb793..73510da 100644
--- a/third_party/dependencies_plugin.tar.gz.sha1
+++ b/third_party/dependencies_plugin.tar.gz.sha1
@@ -1 +1 @@
-77f5f4042c4340df908bb39cdb40a67009195cac
\ No newline at end of file
+577ea397b7e8db5975176c059ce1c5e82e2ea085
\ No newline at end of file
diff --git a/tools/create_local_maven_with_dependencies.py b/tools/create_local_maven_with_dependencies.py
index e5d8885..28f7401 100755
--- a/tools/create_local_maven_with_dependencies.py
+++ b/tools/create_local_maven_with_dependencies.py
@@ -25,9 +25,8 @@
ESPRESSO_VERSION = '3.0.0'
FASTUTIL_VERSION = '7.2.1'
KOTLIN_METADATA_VERSION = '0.7.0'
-KOTLIN_VERSION = '1.8.0'
-GUAVA_VERSION = '31.1-jre'
-GUAVA_VERSION_NEW = '32.1.2-jre'
+KOTLIN_VERSION = '1.9.0'
+GUAVA_VERSION = '32.1.2-jre'
GSON_VERSION = '2.10.1'
JAVASSIST_VERSION = '3.29.2-GA'
JUNIT_VERSION = '4.13-beta-2'
@@ -39,17 +38,51 @@
# Resource shrinker dependency versions
AAPT2_PROTO_VERSION = '8.2.0-alpha10-10154469'
PROTOBUF_VERSION = '3.19.3'
-STUDIO_SDK_VERSION = '31.2.0-alpha10'
+STUDIO_SDK_VERSION = '31.2.0-rc01'
BUILD_DEPENDENCIES = [
'com.google.code.gson:gson:{version}'.format(version=GSON_VERSION),
'com.google.guava:guava:{version}'.format(version=GUAVA_VERSION),
'it.unimi.dsi:fastutil:{version}'.format(version=FASTUTIL_VERSION),
- 'org.jetbrains.kotlinx:kotlinx-metadata-jvm:{version}'.format(
- version=KOTLIN_METADATA_VERSION),
+
'org.ow2.asm:asm:{version}'.format(version=ASM_VERSION),
'org.ow2.asm:asm-util:{version}'.format(version=ASM_VERSION),
'org.ow2.asm:asm-commons:{version}'.format(version=ASM_VERSION),
+
+ 'com.google.errorprone:javac:9+181-r4173-1',
+
+ 'com.android.tools.build:aapt2-proto:{version}'.format(
+ version=AAPT2_PROTO_VERSION),
+ 'com.android.tools.layoutlib:layoutlib-api:{version}'.format(
+ version=STUDIO_SDK_VERSION),
+ 'com.android.tools:common:{version}'.format(version=STUDIO_SDK_VERSION),
+ 'com.android.tools:sdk-common:{version}'.format(version=STUDIO_SDK_VERSION),
+ 'com.google.protobuf:protobuf-java:{version}'.format(
+ version=PROTOBUF_VERSION),
+
+ 'org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-compiler-embeddable:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-gradle-plugin-idea:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-reflect:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-script-runtime:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlin:kotlin-tooling-core:{version}'.format(
+ version=KOTLIN_VERSION),
+ 'org.jetbrains.kotlinx:kotlinx-metadata-jvm:{version}'.format(
+ version=KOTLIN_METADATA_VERSION),
+ 'org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.3',
]
TEST_DEPENDENCIES = [
@@ -60,44 +93,17 @@
'com.google.errorprone:error_prone_core:{version}'.format(
version=ERROR_PRONE_VERSION),
'org.javassist:javassist:{version}'.format(version=JAVASSIST_VERSION),
- 'org.jetbrains.kotlin:kotlin-stdlib:{version}'.format(
- version=KOTLIN_VERSION),
- 'org.jetbrains.kotlin:kotlin-reflect:{version}'.format(
- version=KOTLIN_VERSION),
'org.mockito:mockito-core:{version}'.format(version=MOCKITO_VERSION),
'org.testng:testng:{version}'.format(version=TESTNG_VERSION),
]
-NEW_DEPENDENCIES = [
- 'com.google.guava:guava:{version}'.format(version=GUAVA_VERSION_NEW),
- 'org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.0.6',
- 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10',
- 'org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10',
- 'org.jetbrains.kotlin:kotlin-reflect:1.6.10',
- 'org.jetbrains.kotlin:kotlin-reflect:1.8.10',
- 'org.jetbrains.kotlin:kotlin-script-runtime:1.8.10',
- 'org.jetbrains.kotlin:kotlin-tooling-core:1.8.10',
- 'net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.0.1',
- 'com.google.errorprone:javac:9+181-r4173-1',
- # Gradle 8.3
- 'org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.0',
- 'org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.0',
- 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0',
- 'org.jetbrains.kotlin:kotlin-reflect:1.9.0',
- 'org.jetbrains.kotlin:kotlin-script-runtime:1.9.0',
- 'org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.0',
- # Resource shrinker
- 'com.android.tools.build:aapt2-proto:{version}'.format(
- version=AAPT2_PROTO_VERSION),
- 'com.android.tools.layoutlib:layoutlib-api:{version}'.format(
- version=STUDIO_SDK_VERSION),
- 'com.android.tools:common:{version}'.format(version=STUDIO_SDK_VERSION),
- 'com.android.tools:sdk-common:{version}'.format(version=STUDIO_SDK_VERSION),
- 'com.google.protobuf:protobuf-java:{version}'.format(
- version=PROTOBUF_VERSION),
-]
-
PLUGIN_DEPENDENCIES = [
+ 'org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.0',
+ 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10',
+ 'net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.0.1',
+
+ # Patched version of org.spdx.sbom:org.spdx.sbom.gradle.plugin:0.2.0.
+ # See commit message for a13217f333cc65fb602502ac446698dd74d10b7f.
'org.spdx.sbom:org.spdx.sbom.gradle.plugin:0.2.0-r8-patch01',
# See https://github.com/FasterXML/jackson-core/issues/999.
'ch.randelshofer:fastdoubleparser:0.8.0',
@@ -204,13 +210,6 @@
args, dependencies_path, repositories, BUILD_DEPENDENCIES + TEST_DEPENDENCIES)
set_utime(dependencies_path)
dependencies.append('dependencies')
- dependencies_new_path = os.path.join(utils.THIRD_PARTY, 'dependencies_new')
- remove_local_maven_repository(dependencies_new_path)
- print("Downloading to " + dependencies_new_path)
- create_local_maven_repository(
- args, dependencies_new_path, repositories, NEW_DEPENDENCIES)
- set_utime(dependencies_new_path)
- dependencies.append('dependencies_new')
upload_cmds = []
for dependency in dependencies:
