Allow obfuscate PublicSuffixDatabase (#6974)

square · Jan 3, 2022 · 9b4b06f · 9b4b06f
1 parent c48f63b
commit 9b4b06f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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/...3/internal/publicsuffix/publicsuffixes.gz → ...rnal/publicsuffix/PublicSuffixDatabase.gz b/...3/internal/publicsuffix/publicsuffixes.gz → ...rnal/publicsuffix/PublicSuffixDatabase.gz