zapstore-mirror/dev.msfjarvis.claw.android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1.210.*] Pre-release merge (#675)

Browse Source
This commit is contained in:
tramline-github[bot]
2024-10-04 14:30:10 +00:00
committed by GitHub
parent 58c8376e46 0b549dde2d
commit dc965abf44
17 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/code_quality_analysis.yml
+3 -3
View File
@@ -29,7 +29,7 @@ jobs:
cache-read-only: true
- name: Initialize CodeQL
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
with:
languages: java
tools: latest
@@ -41,7 +41,7 @@ jobs:
./gradlew assembleDebug assembleInternal
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
with:
category: "/language:java"
mobsfscan:
@@ -62,6 +62,6 @@ jobs:
args: . --sarif --output results.sarif || true
- name: Upload mobsfscan report
uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
with:
sarif_file: results.sarif
android/lint-baseline.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
<issue
id="VectorPath"
api/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
api/src/main/kotlin/dev/msfjarvis/claw/api/converters/CSRFTokenConverter.kt
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright © 2023 Harsh Shandilya.
* Copyright © 2023-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.
@@ -19,8 +19,9 @@ object CSRFTokenConverter : Converter<ResponseBody, CSRFToken> {
val token =
Jsoup.parse(value.string(), LobstersApi.BASE_URL)
.select("meta[name=\"csrf-token\"]")
.first()!!
.attr("content")
.firstOrNull()
?.attr("content")
.orEmpty()
return CSRFToken(token)
}
api/src/test/kotlin/dev/msfjarvis/claw/util/TestUtils.kt
+4 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright © 2021-2023 Harsh Shandilya.
* 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.
@@ -15,7 +15,9 @@ import kotlin.contracts.contract
object TestUtils {
fun getResource(path: String): String {
// Load the JSON response
val uri = javaClass.classLoader!!.getResource(path)
val uri =
requireNotNull(javaClass.classLoader) { "if this is null something has gone very wrong" }
.getResource(path)
val file = File(uri.path)
return String(file.readBytes())
}
build-logic/lint-baseline.xml
+12 -1
View File
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0)" variant="all" version="8.7.0">
<issue
id="GradleProjectIsolation"
message="Avoid using method getRootProject"
errorLine1=" val collectorTask = project.rootProject.tasks.named&lt;Copy>(&quot;collectLintReports&quot;)"
errorLine2=" ~~~~~~~~~~~">
<location
file="src/main/kotlin/dev/msfjarvis/claw/gradle/LintConfig.kt"
line="51"
column="33"/>
</issue>
</issues>
build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
+2 -2
View File
@@ -17,11 +17,11 @@ import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("Unused")
@Suppress("Unused", "UnstableApiUsage")
class KotlinCommonPlugin : Plugin<Project> {
override fun apply(project: Project) {
if (project.rootProject == project) {
if (project.isolated.rootProject == project.isolated) {
LintConfig.configureRootProject(project)
} else if (project.name != "benchmark") {
LintConfig.configureSubProject(project)
build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt
+2 -2
View File
@@ -16,11 +16,11 @@ import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
@Suppress("Unused")
@Suppress("Unused", "UnstableApiUsage")
class SpotlessPlugin : Plugin<Project> {
override fun apply(project: Project) {
if (project.rootProject != project) {
if (project.isolated.rootProject != project.isolated) {
throw GradleException("Spotless plugin must only be applied to the root project.")
}
project.pluginManager.apply(SpotlessPlugin::class)
build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/signing/AppSigning.kt
+6 -2
View File
@@ -14,8 +14,9 @@ import org.gradle.api.Project
private const val KEYSTORE_CONFIG_PATH = "keystore.properties"
/** Configure signing for all build types. */
@Suppress("UnstableApiUsage")
internal fun Project.configureBuildSigning() {
val keystoreConfigFile = rootProject.layout.projectDirectory.file(KEYSTORE_CONFIG_PATH)
val keystoreConfigFile = isolated.rootProject.projectDirectory.file(KEYSTORE_CONFIG_PATH)
if (keystoreConfigFile.asFile.exists()) {
extensions.configure<CommonExtension<*, ApplicationBuildType, *, *, *, *>>("android") {
val contents = providers.fileContents(keystoreConfigFile).asText
@@ -25,7 +26,10 @@ internal fun Project.configureBuildSigning() {
signingConfigs.register("release") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = rootProject.file(keystoreProperties["storeFile"] as String)
storeFile =
isolated.rootProject.projectDirectory
.file(keystoreProperties["storeFile"] as String)
.asFile
storePassword = keystoreProperties["storePassword"] as String
}
buildTypes.configureEach { signingConfig = releaseSigningConfig.get() }
common/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
core/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
database/core/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
database/impl/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
gradle/libs.versions.toml
+2 -2
View File
@@ -102,7 +102,7 @@ retrofit-kotlinxSerializationConverter = { module = "com.squareup.retrofit2:conv
sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-sdk" }
sentry-bom = { module = "io.sentry:sentry-bom", version.ref = "sentry-sdk" }
slack-compose-lints = "com.slack.lint.compose:compose-lint-checks:1.4.1"
slack-lints = "com.slack.lint:slack-lint-checks:0.8.0"
slack-lints = "com.slack.lint:slack-lint-checks:0.8.1"
sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
sqldelight-dialect338 = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" }
sqldelight-extensions-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" }
@@ -121,7 +121,7 @@ android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android
android-test = { id = "com.android.test", version.ref = "agp" }
anvil = "com.squareup.anvil:2.5.0-beta11"
baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
dependencyAnalysis = "com.autonomousapps.dependency-analysis:2.1.1"
dependencyAnalysis = "com.autonomousapps.dependency-analysis:2.1.3"
invert = "com.squareup.invert:0.0.1-dev"
kotlin-composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
model/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
store/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>
web/lint-baseline.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.4.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.4.2)" variant="all" version="8.4.2">
<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.0)" variant="all" version="8.7.0">
</issues>