Update okio lib version to 3.9.1
Test: ./gradlew bOS
Change-Id: I69d4af95c8a7d86fc72186952aa18d8f4e14e59b
diff --git a/datastore/datastore-core-okio/build.gradle b/datastore/datastore-core-okio/build.gradle
index 76f36b5..7df135b 100644
--- a/datastore/datastore-core-okio/build.gradle
+++ b/datastore/datastore-core-okio/build.gradle
@@ -22,6 +22,7 @@
* modifying its settings.
*/
+import androidx.build.KotlinTarget
import androidx.build.LibraryType
import androidx.build.PlatformIdentifier
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
@@ -102,4 +103,5 @@
inceptionYear = "2020"
description = "Android DataStore Core Okio- contains APIs to use datastore-core in multiplatform via okio"
metalavaK2UastEnabled = false
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
}
diff --git a/datastore/datastore-guava/build.gradle b/datastore/datastore-guava/build.gradle
index 3ee7bbb..870ef8e 100644
--- a/datastore/datastore-guava/build.gradle
+++ b/datastore/datastore-guava/build.gradle
@@ -21,6 +21,7 @@
* Please use that script when creating a new project, rather than copying an existing project and
* modifying its settings.
*/
+import androidx.build.KotlinTarget
import androidx.build.LibraryType
plugins {
@@ -61,4 +62,5 @@
inceptionYear = "2024"
description = "Android DataStore Guava - contains wrappers for using DataStore using ListenableFuture"
metalavaK2UastEnabled = true
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
}
diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle
index db861b7..e43148c 100644
--- a/datastore/datastore-rxjava2/build.gradle
+++ b/datastore/datastore-rxjava2/build.gradle
@@ -21,6 +21,8 @@
* Please use that script when creating a new project, rather than copying an existing project and
* modifying its settings.
*/
+
+import androidx.build.KotlinTarget
import androidx.build.LibraryType
plugins {
@@ -64,4 +66,5 @@
inceptionYear = "2020"
description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
legacyDisableKotlinStrictApiMode = true
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
}
diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle
index 58fe0d7..5784b7f 100644
--- a/datastore/datastore-rxjava3/build.gradle
+++ b/datastore/datastore-rxjava3/build.gradle
@@ -21,6 +21,8 @@
* Please use that script when creating a new project, rather than copying an existing project and
* modifying its settings.
*/
+
+import androidx.build.KotlinTarget
import androidx.build.LibraryType
plugins {
@@ -64,4 +66,5 @@
inceptionYear = "2020"
description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
legacyDisableKotlinStrictApiMode = true
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
}
diff --git a/datastore/datastore/build.gradle b/datastore/datastore/build.gradle
index 6bdb7be..0933373 100644
--- a/datastore/datastore/build.gradle
+++ b/datastore/datastore/build.gradle
@@ -21,6 +21,7 @@
* Please use that script when creating a new project, rather than copying an existing project and
* modifying its settings.
*/
+import androidx.build.KotlinTarget
import androidx.build.LibraryType
import androidx.build.PlatformIdentifier
@@ -113,4 +114,5 @@
description = "Android DataStore - contains the underlying store used by each serialization " +
"method along with components that require an Android dependency"
legacyDisableKotlinStrictApiMode = true
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 66db4f6..718534e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -260,7 +260,7 @@
moshiCodeGen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.10.18" }
okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version = "3.14.7" }
-okio = { module = "com.squareup.okio:okio", version = "3.6.0" }
+okio = { module = "com.squareup.okio:okio", version = "3.9.1" }
opentest4j = { module = "org.opentest4j:opentest4j", version = "1.2.0" }
playFeatureDelivery = { module = "com.google.android.play:feature-delivery", version = "2.1.0" }
playCore = { module = "com.google.android.play:core", version = "1.10.3" }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index b74939c..ac7ebac 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -9710,39 +9710,6 @@
=VojG
-----END PGP PUBLIC KEY BLOCK-----
-pub 6ED0F678B90EB06E
-sub 3605922A9B0C4A82
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
-
-mQENBFTCZ/YBCAC/AX5Uve8E97kKLWumtArjcouxHzENzNez3/wjiuIdCTchm/G6
-fUKHNTqo9sdcnvAO4mfJbysXh1tqXl6zxjw1QdQGCyy8klGRlpEiper0eS5heDhV
-n6uetXQQYGFRhBmoNPeRq0xZ2qlZBJLAL4OHhBwtksyw7sDi/EzETU5gGk3RFyk3
-EMK/bwbMw1Rrpf6sDmbFI5IqFGvla8CbNSeHEBw1TWWqWH0iv7ROY/RkAm3RYbGK
-CVWPwKe7yV5L5X5LGb42yi4jN9U/Wr/eYR83BIUf6qM4ks/EBDo6SdENwndIMWo9
-hMXVje8NlE5TxfslTYT4+RSHhyf5vojP4tsBABEBAAG5AQ0EVMJn9gEIANZoqY41
-Ux5fsYb+I0M4FdrWEuXwezZdwRhF9LSqyu8SobICjV2taVMC1AMoFt4YAbrlhWR1
-IB5a63vIFl57ujoNHkLvZ2ac7QmJbFg/M+JmYQ4ksR/0AmPMQ7Z9bU5oPl9tnawG
-RkwRGEB+hX+osgXdt8w2tEBm3h91WeV9hjd+oOQ6MMGlnl/JRmSJKXqW7lrq1LUm
-lzkTGKonU4S5IDoK9WHIwR66cSDCf21pZHaAPYgo/zY4ZTj2yJ7aAl3HxJZQZ8OR
-03YXg0vT9DovzrgMF3zEGNBIznRYFd1a8imexlvzKjj+GckM3uVaidLTCBH/BuMY
-wW+1d1xupq7pu4sAEQEAAYkBJQQYAQIADwUCVMJn9gIbDAUJB4YfgAAKCRBu0PZ4
-uQ6wbkPyB/4yfuUYRDCqvZlGn9hzODZCFrJeLJKZZqb7kQ6I2pUw6jWV3F+hkOSC
-cA0MMJ+Xg3puWQw4MOoPauyL7YSgC/fgt9kEwdy4kwqAZyd6vjg5ebiZOgouR6Xv
-czFVSo/l4kXSyYJvc52Ecfz8bhwNh7t7CJ+kJ5QB3K6TBP+eRDvgBbM8AowD+FQ1
-FHyc5bJmqogkdPIiJv9KyhWJBxst9luzp/8cpKadPXwQMLU1Ru9Ds1BPfBbUoVBQ
-hhjgG+RHX2dpAcsk/aH6opZAT6fdi6cz+wunXghdVK6dHjUk2L2U2MDc62XdiipB
-cXNfFAXaq7yDNmT69sQhIhTHPzDNVzmuiQE8BBgBAgAmAhsMFiEE0Gb1xHHTKgDS
-RPmdbtD2eLkOsG4FAlxhAb4FCQthAMgACgkQbtD2eLkOsG5PTggAtAOGqP372Mqm
-ZzySlBh/H/96TrsWrg6yezNnzqhLEuCAQbeMCbtNnonasBCPZ+wyHyIlqRFAJvbQ
-VMLac69ykdto1Q2/82To/rr+lUnrNg41dfwzbRIh9eJYqsSjTSJB04+0KUed9ZmH
-NVtcw6q9DCaXTtExJUv+9muaNPQW1EJ14XSQ8aSUZstsaK+gdZa1XVfhaL7yK4fZ
-Cm+oe69fyWFnwqcvQ36luF3xRlwznlpP0XZ76IyCJqGmxc7zAhG46PwqKK1/ogep
-q0EyCTGox18n1H1H8bydHoHcfeDczdtfjtxcnCutUXJIRu/c7M1JEBIJPZSLoHfy
-T/08YlPSGg==
-=FcJr
------END PGP PUBLIC KEY BLOCK-----
-
pub 6EFF5EF5523052D4
uid Thilo Schuchort <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7869e44..2709c21 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -85,8 +85,8 @@
<trusting group="org.codehaus.plexus"/>
</trusted-key>
<trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0">
- <trusting group="org.apache.logging.log4j"/>
<trusting group="org.apache.logging"/>
+ <trusting group="org.apache.logging.log4j"/>
</trusted-key>
<trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="org.apache.httpcomponents"/>
<trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
