[1.60.*] Pre-release merge (#460)

msfjarvis · Feb 22, 2024 · dc3d259 · dc3d259
2 parents 613f8a8 + b68d58c
commit dc3d259
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 18 deletions.
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -32,8 +32,11 @@ android {
     useLiveLiterals = false
     kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
-  // kotlinx.serialization 1.6.0-RC regression
-  packagingOptions.resources.pickFirsts += "**/*.bin"
+  buildTypes.create("internal") {
+    matchingFallbacks += "release"
+    signingConfig = signingConfigs["debug"]
+    applicationIdSuffix = ".internal"
+  }
 }
 
 baselineProfile {

diff --git a/android/lint-baseline.xml b/android/lint-baseline.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.ui.lint.UiIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;com.android.tools.lint.detector.api.UastLintUtilsKt: boolean isIncorrectImplicitReturnInLambda(org.jetbrains.uast.UElement)&#xA;(Referenced from androidx/compose/ui/lint/ReturnFromAwaitPointerEventScopeDetector.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`UnnecessaryComposedModifier`&#xA;`ModifierFactoryExtensionFunction`&#xA;`ModifierFactoryReturnType`&#xA;`ModifierFactoryUnreferencedReceiver`&#xA;`ModifierNodeInspectableProperties`&#xA;`ModifierParameter`&#xA;`MultipleAwaitPointerEventScopes`&#xA;`ReturnFromAwaitPointerEventScope`&#xA;`SuspiciousCompositionLocalModifierRead`&#xA;`SuspiciousModifierThen`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="../../../.gradle/caches/transforms-4/5597572e60f903af6673942780c1acb6/transformed/ui-release/jars/lint.jar"/>
+    </issue>
 
     <issue
         id="VectorPath"

diff --git a/android/src/internal/res/values/strings.xml b/android/src/internal/res/values/strings.xml
@@ -0,0 +1,9 @@
+<!--
+ ~ Copyright © 2021-2024 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
+<resources>
+  <string name="app_name">Claw 🤫</string>
+</resources>
diff --git a/api/lint-baseline.xml b/api/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
 
 </issues>
diff --git a/common/lint-baseline.xml b/common/lint-baseline.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.ui.lint.UiIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;com.android.tools.lint.detector.api.UastLintUtilsKt: boolean isIncorrectImplicitReturnInLambda(org.jetbrains.uast.UElement)&#xA;(Referenced from androidx/compose/ui/lint/ReturnFromAwaitPointerEventScopeDetector.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`UnnecessaryComposedModifier`&#xA;`ModifierFactoryExtensionFunction`&#xA;`ModifierFactoryReturnType`&#xA;`ModifierFactoryUnreferencedReceiver`&#xA;`ModifierNodeInspectableProperties`&#xA;`ModifierParameter`&#xA;`MultipleAwaitPointerEventScopes`&#xA;`ReturnFromAwaitPointerEventScope`&#xA;`SuspiciousCompositionLocalModifierRead`&#xA;`SuspiciousModifierThen`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="../../../.gradle/caches/transforms-4/5597572e60f903af6673942780c1acb6/transformed/ui-release/jars/lint.jar"/>
+    </issue>
 
 </issues>
diff --git a/core/lint-baseline.xml b/core/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
 
 </issues>
diff --git a/database/core/lint-baseline.xml b/database/core/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
 
 </issues>
diff --git a/database/impl/lint-baseline.xml b/database/impl/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
 
 </issues>
diff --git a/gradle.properties b/gradle.properties
@@ -58,3 +58,4 @@ spotlessSetLicenseHeaderYearsFromGitHistory=true
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
 systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
 systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
+nl.littlerobots.vcu.resolver=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
 aboutLibraries = "11.1.0-b03"
 agp = "8.3.0-rc02"
-benchmark = "1.2.3"
+benchmark = "1.3.0-alpha01"
 coil = "2.5.0"
 # @keep used for kotlinCompilerExtensionVersion
-composeCompiler = "1.5.9"
+composeCompiler = "1.5.10"
 coroutines = "1.8.0"
 dagger = "2.50"
 glance = "1.0.0"
 junit = "5.10.2"
 konvert = "3.0.0"
 kotlin = "1.9.22"
 kotlinResult = "1.1.18"
-lifecycle = "2.8.0-alpha01"
+lifecycle = "2.8.0-alpha02"
 retrofit = "2.9.0"
 richtext = "0.20.0"
-sentry-sdk = "7.3.0"
+sentry-sdk = "7.4.0"
 serialization = "1.6.3"
 sqldelight = "2.0.1"
 whetstone = "0.8.0"
@@ -25,9 +25,9 @@ workmanager = "2.10.0-alpha01"
 aboutLibraries-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibraries" }
 androidx-activity-compose = "androidx.activity:activity-compose:1.9.0-alpha03"
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
-androidx-browser = "androidx.browser:browser:1.8.0-beta02"
+androidx-browser = "androidx.browser:browser:1.8.0-rc01"
 androidx-compose-animation = { module = "androidx.compose.animation:animation" }
-androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2024.02.00-alpha01"
+androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2024.02.00-alpha02"
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
 androidx-compose-glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
 androidx-compose-glance-m3 = { module = "androidx.glance:glance-material3", version.ref = "glance" }
@@ -44,15 +44,15 @@ androidx-core-splashscreen = "androidx.core:core-splashscreen:1.1.0-alpha02"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
 androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle" }
-androidx-navigation-compose = "androidx.navigation:navigation-compose:2.8.0-alpha02"
+androidx-navigation-compose = "androidx.navigation:navigation-compose:2.8.0-alpha03"
 androidx-paging-compose = "androidx.paging:paging-compose:3.3.0-alpha03"
 androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.0-alpha01"
 androidx-test-core = "androidx.test:core:1.6.0-alpha05"
 androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-alpha03"
 androidx-test-ext-junit = "androidx.test.ext:junit:1.2.0-alpha03"
 androidx-test-rules = "androidx.test:rules:1.6.0-alpha03"
 androidx-test-runner = "androidx.test:runner:1.6.0-alpha06"
-androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0-rc01"
+androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workmanager" }
 build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 build-cachefix = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0.1"

diff --git a/model/lint-baseline.xml b/model/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
 
 </issues>
diff --git a/web/lint-baseline.xml b/web/lint-baseline.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha16" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-alpha16)" variant="all" version="8.3.0-alpha16">
+<issues format="6" by="lint 8.3.0-rc02" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0-rc02)" variant="all" version="8.3.0-rc02">
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.ui.lint.UiIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;com.android.tools.lint.detector.api.UastLintUtilsKt: boolean isIncorrectImplicitReturnInLambda(org.jetbrains.uast.UElement)&#xA;(Referenced from androidx/compose/ui/lint/ReturnFromAwaitPointerEventScopeDetector.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`UnnecessaryComposedModifier`&#xA;`ModifierFactoryExtensionFunction`&#xA;`ModifierFactoryReturnType`&#xA;`ModifierFactoryUnreferencedReceiver`&#xA;`ModifierNodeInspectableProperties`&#xA;`ModifierParameter`&#xA;`MultipleAwaitPointerEventScopes`&#xA;`ReturnFromAwaitPointerEventScope`&#xA;`SuspiciousCompositionLocalModifierRead`&#xA;`SuspiciousModifierThen`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="../../../.gradle/caches/transforms-4/5597572e60f903af6673942780c1acb6/transformed/ui-release/jars/lint.jar"/>
+    </issue>
 
 </issues>