From 9b4b06f6cdf7d23fe6bb327d738f65bcb8175132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E9=9B=AA=E7=8F=8A?= Date: Tue, 4 Jan 2022 00:06:08 +0800 Subject: [PATCH] Allow obfuscate PublicSuffixDatabase (#6974) --- .../internal/publicsuffix/PublicSuffixDatabase.kt | 3 ++- .../jvmMain/resources/META-INF/proguard/okhttp3.pro | 2 +- .../resources/okhttp3/internal/publicsuffix/NOTICE | 2 +- .../{publicsuffixes.gz => PublicSuffixDatabase.gz} | Bin 4 files changed, 4 insertions(+), 3 deletions(-) rename okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/{publicsuffixes.gz => PublicSuffixDatabase.gz} (100%) diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt b/okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt index ba6e3f51f8ea..2c65c286deee 100644 --- a/okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt +++ b/okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt @@ -237,7 +237,8 @@ class PublicSuffixDatabase { } companion object { - const val PUBLIC_SUFFIX_RESOURCE = "publicsuffixes.gz" + @JvmField + val PUBLIC_SUFFIX_RESOURCE = "${PublicSuffixDatabase::class.java.simpleName}.gz" private val WILDCARD_LABEL = byteArrayOf('*'.code.toByte()) private val PREVAILING_RULE = listOf("*") diff --git a/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro b/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro index 713fbfb3f318..c5b800388776 100644 --- a/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro +++ b/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro @@ -2,7 +2,7 @@ -dontwarn javax.annotation.** # A resource is loaded with a relative path so the package of this class must be preserved. --keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase +-adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. -dontwarn org.codehaus.mojo.animal_sniffer.* diff --git a/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE b/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE index 94973fde8a57..20a042e396b2 100644 --- a/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE +++ b/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE @@ -1,4 +1,4 @@ -Note that publicsuffixes.gz is compiled from The Public Suffix List: +Note that PublicSuffixDatabase.gz is compiled from The Public Suffix List: https://publicsuffix.org/list/public_suffix_list.dat It is subject to the terms of the Mozilla Public License, v. 2.0: diff --git a/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/publicsuffixes.gz b/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz similarity index 100% rename from okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/publicsuffixes.gz rename to okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz