Skip to content

Commit

Permalink
[1.78.*] Pre-release merge (#494)
Browse files Browse the repository at this point in the history
  • Loading branch information
tramline-github[bot] authored Mar 19, 2024
2 parents 2465c56 + aff0e36 commit 2f2f376
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code_quality_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
cache-read-only: true

- name: Initialize CodeQL
uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
with:
languages: java
tools: latest
Expand All @@ -49,7 +49,7 @@ jobs:
./gradlew assembleDebug assembleInternal
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
with:
category: "/language:java"
mobsfscan:
Expand All @@ -70,6 +70,6 @@ jobs:
args: . --sarif --output results.sarif || true

- name: Upload mobsfscan report
uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
with:
sarif_file: results.sarif
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.44.0] - 2024-03-19

### Fixed

* Fixed a bug in the database code that was triggering crashes for
a subset of upgrading users

## [1.43.0] - 2024-03-17

### Fixed
Expand Down Expand Up @@ -375,7 +382,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Initial Play Store release

[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.43.0...HEAD
[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.44.0...HEAD

[1.44.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.43.0...v1.44.0

[1.43.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.42.0...v1.43.0

Expand Down
20 changes: 0 additions & 20 deletions android/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,22 +1,2 @@
-dontobfuscate
-keepattributes SourceFile, LineNumberTable

# From https://github.com/square/retrofit/blob/master/retrofit/src/main/resources/META-INF/proguard/retrofit2.pro

# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
-if interface * { @retrofit2.http.* <methods>; }
-keep,allowobfuscation interface <1>

# Keep inherited services.
-if interface * { @retrofit2.http.* <methods>; }
-keep,allowobfuscation interface * extends <1>

# With R8 full mode generic signatures are stripped for classes that are not
# kept. Suspend functions are wrapped in continuations where the type argument
# is used.
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation

# R8 full mode strips generic signatures from return types if not kept.
-if interface * { @retrofit2.http.* public *** *(...); }
-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
4 changes: 2 additions & 2 deletions android/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
#
versioning-plugin.versionCode=14400
versioning-plugin.versionName=1.44.0-SNAPSHOT
versioning-plugin.versionCode=14500
versioning-plugin.versionName=1.45.0-SNAPSHOT
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/*
* 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.
*/
package dev.msfjarvis.claw.core.injection

import com.deliveryhero.whetstone.app.ApplicationScope
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import com.squareup.anvil.annotations.ContributesTo
import dagger.Module
import dagger.Provides
Expand All @@ -18,6 +17,7 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonNamingStrategy
import okhttp3.MediaType.Companion.toMediaType
import retrofit2.Converter
import retrofit2.converter.kotlinx.serialization.asConverterFactory

@Module
@ContributesTo(ApplicationScope::class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE TABLE ReadPosts(
CREATE TABLE IF NOT EXISTS ReadPosts(
id TEXT NOT NULL PRIMARY KEY
);

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
aboutLibraries = "11.1.0"
agp = "8.3.0"
agp = "8.3.1"
benchmark = "1.3.0-alpha01"
coil = "2.6.0"
# @keep used for kotlinCompilerExtensionVersion
Expand All @@ -13,7 +13,7 @@ konvert = "3.0.1"
kotlin = "1.9.23"
kotlinResult = "2.0.0"
lifecycle = "2.7.0"
retrofit = "2.9.0"
retrofit = "2.10.0"
richtext = "1.0.0-alpha01"
sentry-sdk = "7.6.0"
serialization = "1.6.3"
Expand Down Expand Up @@ -92,7 +92,7 @@ okhttp-core = { module = "com.squareup.okhttp3:okhttp" }
okhttp-loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor" }
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver" }
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
retrofit-kotlinxSerializationConverter = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
retrofit-kotlinxSerializationConverter = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-sdk" }
sentry-bom = { module = "io.sentry:sentry-bom", version.ref = "sentry-sdk" }
sentry-okhttp = { module = "io.sentry:sentry-okhttp", version.ref = "sentry-sdk" }
Expand Down

0 comments on commit 2f2f376

Please sign in to comment.