fixes #7 and updated OkHttp and Gradle. Now targeting Android API 30

gotev · Aug 21, 2020 · 1d598fe · 1d598fe
1 parent ca0dae3
commit 1d598fe
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/cookie-store-okhttp/build.gradle b/cookie-store-okhttp/build.gradle
@@ -38,7 +38,7 @@ dependencies {
 
     // Kotlin
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.squareup.okhttp3:okhttp:4.7.2"
+    implementation "com.squareup.okhttp3:okhttp:4.8.1"
 }
 
 bintray {

diff --git a/cookie-store/src/main/java/net/gotev/cookiestore/InMemoryCookieStore.kt b/cookie-store/src/main/java/net/gotev/cookiestore/InMemoryCookieStore.kt
@@ -140,7 +140,8 @@ open class InMemoryCookieStore(private val name: String) : CookieStore {
         lock.lock()
         try {
             cookies.addAll(getInternal1(uri.host))
-            cookies.addAll(getInternal2(getEffectiveURI(uri)))
+            val internal2 = getInternal2(getEffectiveURI(uri)).filter { !cookies.contains(it) }
+            cookies.addAll(internal2)
         } finally {
             lock.unlock()
         }

diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 17 19:25:02 CEST 2020
+#Fri Aug 21 14:30:06 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/manifest.gradle b/manifest.gradle
@@ -12,15 +12,15 @@ ext {
     library_licenses = ["Apache-2.0"]
     library_licenses_url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
     library_project_group = 'net.gotev'
-    library_version = '1.2.6'
-    version_code = 1
+    library_version = '1.3.0'
+    version_code = 2
     min_sdk = 16
-    target_sdk = 29
+    target_sdk = 30
     demo_app_id = 'net.gotev.cookiestoredemo'
 
     // Gradle classpath dependencies versions
-    kotlin_version = '1.3.71'
-    gradle_version = '3.6.1'
+    kotlin_version = '1.4.0'
+    gradle_version = '4.0.0'
     gradle_versions_plugin_version = '0.28.0'
     bintray_plugin_version = '1.8.4'
     kotlin_lint_version = '9.0.0'