Update dependencies (#182)

* Update dependencies * Workaround https://issuetracker.google.com/u/1/issues/261551057 * Add new Gradle key
illarionov · Oct 7, 2023 · 6de520b · 6de520b
1 parent bbd35f5
commit 6de520b
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 17 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@ minSdk = "23"
 compileSdk = "34"
 targetSdk = "33"
 
-agp = "8.3.0-alpha06"
-android-tools-common = "31.3.0-alpha06"
+agp = "8.3.0-alpha07"
+android-tools-common = "31.3.0-alpha07"
 anvil = "2.4.8"
 bmversions = "0.48.0"
 detekt = "1.23.1"
@@ -16,16 +16,16 @@ ksp = "1.9.10-1.0.13"
 spotless = "6.21.0"
 
 accompanist = "0.33.1-alpha"
-androidx-activity = "1.7.2"
+androidx-activity = "1.8.0"
 androidx-annotation = "1.7.0"
 androidx-annotation-experimental = "1.3.1"
 androidx-appcompat = "1.6.1"
 androidx-arch-core = "2.2.0"
-androidx-benchmark = "1.2.0-rc01"
-androidx-collection = "1.2.0"
-androidx-compose-bom = "2023.09.02"
+androidx-benchmark = "1.2.0-rc02"
+androidx-collection = "1.3.0"
+androidx-compose-bom = "2023.10.00"
 androidx-compose-compiler = "1.5.3"
-androidx-compose-material3 = "1.2.0-alpha08"
+androidx-compose-material3 = "1.2.0-alpha09"
 androidx-compose-runtime-tracing = "1.0.0-alpha04"
 androidx-constraintlayout = "2.1.4"
 androidx-core = "1.12.0"
@@ -35,8 +35,8 @@ androidx-emoji2 = "1.4.0"
 androidx-fragment = "1.6.1"
 androidx-lifecycle = "2.6.2"
 androidx-lifecycle-runtime-compose = "2.6.2"
-androidx-navigation = "2.7.3"
-androidx-navigation-compose = "2.7.3"
+androidx-navigation = "2.7.4"
+androidx-navigation-compose = "2.7.4"
 androidx-profileinstaller = "1.3.1"
 androidx-room = "2.6.0-rc01"
 androidx-splashscreen = "1.0.1"
@@ -78,7 +78,7 @@ kotlinx-coroutines = "1.7.3"
 kotlinx-collections-immutable = "0.3.5"
 kotlinx-dateime = "0.4.1"
 kotlinx-serialization = "1.6.0"
-wire = "4.9.0"
+wire = "4.9.1"
 
 [libraries]
 androidx-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" }

diff --git a/gradle/plugin/project/config/convention/ru.pixnews.gradle.config.firebase.gradle.kts b/gradle/plugin/project/config/convention/ru.pixnews.gradle.config.firebase.gradle.kts
@@ -9,6 +9,7 @@ import com.android.build.api.variant.ApplicationVariant
 import com.android.build.api.variant.ResValue
 import ru.pixnews.gradle.config.firebase.FirebaseConfigReader
 import ru.pixnews.gradle.config.firebase.GenerateFirebaseOptionsTask
+import ru.pixnews.gradle.config.firebase.LocalFirebaseOptions
 import ru.pixnews.gradle.config.util.withAnyOfAndroidPlugins
 
 /**
@@ -58,14 +59,21 @@ fun AndroidComponentsExtension<*, *, *>.registerFirebaseOptionsTask() {
 
         // Manually add google_app_id for Firebase Analytics
         // Cannot use put() here: https://github.com/gradle/gradle/issues/13364
+        val googleAppIdKey = variant.makeResValueKey("string", "google_app_id")
         variant.resValues.putAll(
             firebaseOptionsProvider
-                .map { options ->
-                    options.applicationId?.let {
-                        mapOf(variant.makeResValueKey("string", "google_app_id") to ResValue(it))
-                    } ?: emptyMap()
-                }
+                .map(ApplicationIdToMapOfValuesTransformer(googleAppIdKey))
                 .orElse(emptyMap()),
         )
     }
 }
+
+internal class ApplicationIdToMapOfValuesTransformer(
+    private val googleApiKey: ResValue.Key,
+) : Transformer<Map<ResValue.Key, ResValue>, LocalFirebaseOptions> {
+    override fun transform(options: LocalFirebaseOptions): Map<ResValue.Key, ResValue> {
+        return options.applicationId?.let {
+            mapOf(googleApiKey to ResValue(it))
+        } ?: emptyMap()
+    }
+}
diff --git a/...le/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts b/...le/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts
@@ -9,6 +9,7 @@
 pluginManagement {
     repositories {
         googleExclusiveContent()
+        mavenCentral()
         gradlePluginPortal()
     }
 

diff --git a/gradle/plugin/settings/settings-plugins.gradle.kts b/gradle/plugin/settings/settings-plugins.gradle.kts
@@ -9,5 +9,5 @@ plugins {
 group = "ru.pixnews.gradle.settings"
 
 dependencies {
-    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.13")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.14.1")
 }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -270,6 +270,51 @@ E1GU2n+gEnCLRpmC3Qqmeb0n
 =2JQQ
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    893A028475557671
+uid    Gradle Inc. <[email protected]>
+
+sub    5E9AEEBA28836032
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+WzZKkqBVoahM3qqyoKOy7mfpt1hB4gEq
+=E5AV
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    95C15058A5EDA4F1
 uid    Eric Anderson (Maven Central) <[email protected]>
 
@@ -1237,6 +1282,19 @@ fW1AkBVEk6siyL8PXfxmj9ev3H9xiQVLyJ6HpdHTLVjHjFkgNOLd
 =R7zg
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    CFAE163B64AC9189
+sub    57CE36BB68F1BC57
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mDMEYYx3eRYJKwYBBAHaRw8BAQdAV7zh1T+xL7mD2O63rTIvRfQ9kwL2Gvq/Q6PD
+9apCe2K4OARhjHd5EgorBgEEAZdVAQUBAQdA/AOwflH/rum1g1gvFPBcqhvFOcN8
+0VUb7OqoENSzUD4DAQgHiH4EGBYKACYWIQQgcjpjmbwGAVQoOzfPrhY7ZKyRiQUC
+YYx3eQIbDAUJA8JnAAAKCRDPrhY7ZKyRiSq0AQCEwGRGd5MOTT2kKJf9CphX0LOs
+qVBBSNvzoloV04wzywD+P4TmIz/CsigszDQy8yl1/rGvszo7gaUwnfnqN61JHgA=
+=tzS3
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    D041CAD2E452550F
 uid    Deanna <[email protected]>
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -74,8 +74,10 @@
          <trusted-key id="835a685c8c6f49c54980e5caf406f31bc1468eba" group="org.jcodec"/>
          <trusted-key id="837b2cbb1d966c80643a2d6527f164f945828c4c" group="^com[.]willowtreeapps($|([.].*))" regex="true"/>
          <trusted-key id="8461efa0e74abae010de66994eb27db2a3b88b8b">
+            <trusting group="androidx.activity"/>
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.benchmark"/>
+            <trusting group="androidx.collection"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.emoji2"/>
             <trusting group="androidx.lifecycle"/>
@@ -418,6 +420,11 @@
             <pgp value="842afb86375d805422835bfd82b5574242c20d6f"/>
          </artifact>
       </component>
+       <component group="org.gradle" name="github-dependency-graph-gradle-plugin" version="0.4.1">
+           <artifact name="github-dependency-graph-gradle-plugin-0.4.1.jar">
+               <pgp value="7b79add11f8a779fe90fd3d0893a028475557671"/>
+           </artifact>
+       </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.7.0">
          <artifact name="jose4j-0.7.0.jar">
             <pgp value="3051d45031e13516a6e8faff280d66a55f5316c5"/>
@@ -453,6 +460,11 @@
             <sha256 value="8e9058f9ef7136c55a24a5cf2a0a1928d6fda18276259d0a92d6b102bf26d427" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.1.2">
+         <artifact name="gradle-kotlin-dsl-plugins-4.1.2.jar">
+            <sha256 value="1e78b41faa412fb7d153b947c6f3a0ee4fd2815f5d17dfb38dbecc64d79ae366" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradlex" name="build-parameters" version="1.4.3">
          <artifact name="build-parameters-1.4.3.jar">
             <pgp value="66d7cbff956830fe9f5a723afe6c7d77a1ce15a6"/>
@@ -483,6 +495,11 @@
             <pgp value="8e3a02905a1ae67e7b0f9acd3967d4eda591b991"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.skiko" name="skiko-awt" version="0.7.7">
+         <artifact name="skiko-awt-0.7.7.jar">
+            <pgp value="20723a6399bc060154283b37cfae163b64ac9189"/>
+         </artifact>
+      </component>
       <component group="org.jline" name="jline" version="3.3.1">
          <artifact name="jline-3.3.1.jar">
             <pgp value="ea23db1360d9029481e7f2efecdfea3cb4493b94"/>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME