Update desugared library configuration versions
Releasing support for Base64.
jdk8: No change (not updated any more)
jdk11_legacy: No change (not updated any more)
jdk11_minimal, jdk11 and jdk11_nio: 2.0.4
jdk11_minimal has not changed as it does not include Base64, but updated
version anyway to keep same version for all jdk11 versions.
Using revision ed7b0012869402d8755876723d75cccd6ff652d0 of
https://github.com/google/desugar_jdk_libs obtained with:
tools/desugar_jdk_libs_update.py
--desugar-jdk-libs-revision ed7b0012869402d8755876723d75cccd6ff652d0
Bug: b/308750535
Change-Id: I0fd56e7db04946a8098e2fce37179227b44be651diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index 965e3cf..6991778 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.0.3",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.0.4",
"configuration_format_version": 100,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
index 03edf18..b0dc30e 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.0.3",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.0.4",
"configuration_format_version": 100,
"required_compilation_api_level": 24,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 5558506..ebeda3f 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.0.3",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.0.4",
"configuration_format_version": 100,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
index b40440f..758e8f0 100644
--- a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
@@ -1 +1 @@
-7096cb60144403855f9ae867481f0238e8380def
\ No newline at end of file
+47cfa6d72be316cdaff6e5042111a18215ac4405
\ No newline at end of file
diff --git a/tools/desugar_jdk_libs_repository.py b/tools/desugar_jdk_libs_repository.py
index d2ebeac..6d44d23 100755
--- a/tools/desugar_jdk_libs_repository.py
+++ b/tools/desugar_jdk_libs_repository.py
@@ -248,7 +248,23 @@
print()
print("deployed to Maven repository at " + args.repo_root + ".")
print()
- print("Add")
+ print("For Kotlin Script add")
+ print()
+ print(" maven(url = \"file:///tmp/repo\")")
+ print()
+ print(
+ "to dependencyResolutionManagement.repositories in settings.gradle.kts, and use"
+ )
+ print(
+ 'the "changing" property of the coreLibraryDesugaring dependency:')
+ print()
+ print(" coreLibraryDesugaring('com.android.tools:%s:%s') {" %
+ (artifact, version))
+ print(" isChanging = true")
+ print(" }")
+ print()
+
+ print("For Grovey add")
print()
print(" maven {")
print(" url uri('file://" + args.repo_root + "')")
@@ -266,8 +282,8 @@
print(" }")
print()
print(
- 'If not using the "changing" propertyRemember to run gradle with ' +
- " --refresh-dependencies (./gradlew --refresh-dependencies ...) " +
+ 'If not using the "changing" property remember to run gradle with ' +
+ "--refresh-dependencies (./gradlew --refresh-dependencies ...) " +
"to ensure the cache is not used when the same version is published."
+ "multiple times.")
diff --git a/tools/utils.py b/tools/utils.py
index 3ef0a8f..4b84f58 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -55,7 +55,7 @@
GRADLE_TASK_TEST = ':test:test'
GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR = ':test:rewriteTestsForR8LibWithRelocatedDeps'
GRADLE_TASK_TEST_DEPS_JAR = ':test:packageTestDeps'
-GRADLE_TASK_TEST_JAR = ':test:allTestsJar'
+GRADLE_TASK_TEST_JAR = ':test:relocateTestsForR8LibWithRelocatedDeps'
R8 = 'r8'
R8LIB = 'r8lib'
