Skip to content

Commit 7e5de07

Browse files
committed
changelogs/1922436.txt
1 parent a30df66 commit 7e5de07

45 files changed

Lines changed: 344 additions & 63 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.idea/androidTestResultsUserPreferences.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/_app_androidTest.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,27 @@ if (!localPropertiesFile.exists()) {
2929
localProperties.load(new FileInputStream(localPropertiesFile))
3030

3131
android {
32-
compileSdk 35
32+
compileSdk 36
3333

3434
signingConfigs {
3535
googleplay {
36-
keyAlias localProperties['RELEASE_KEY_ALIAS']
37-
keyPassword localProperties['RELEASE_KEY_PASSWORD']
38-
storeFile file(localProperties['RELEASE_STORE_FILE'])
39-
storePassword localProperties['RELEASE_STORE_PASSWORD']
36+
keyAlias localProperties.getProperty('RELEASE_KEY_ALIAS')
37+
keyPassword localProperties.getProperty('RELEASE_KEY_PASSWORD')
38+
storeFile file(localProperties.getProperty('RELEASE_STORE_FILE'))
39+
storePassword localProperties.getProperty('RELEASE_STORE_PASSWORD')
4040
}
4141
}
4242

4343
defaultConfig {
4444
minSdkVersion 24
45-
targetSdkVersion 35
45+
targetSdkVersion 36
4646

4747
applicationId "com.github.jameshnsears.quoteunquote"
4848

4949
// changelog version | min sdk | target sdk
50-
versionCode 1912435
50+
versionCode 1922436
5151
// semantic versioning
52-
versionName "4.51.0"
52+
versionName "4.52.0"
5353

5454
vectorDrawables.useSupportLibrary = true
5555

@@ -91,13 +91,13 @@ android {
9191
}
9292

9393
buildTypes {
94-
def gitHash = { ->
95-
def stdout = new ByteArrayOutputStream()
94+
final def gitHash = { ->
95+
final def stdout = new ByteArrayOutputStream()
9696
exec {
9797
commandLine 'git', 'rev-parse', '--short=8', 'HEAD'
9898
standardOutput = stdout
9999
}
100-
return stdout.toString().trim()
100+
stdout.toString().trim()
101101
}
102102

103103
release {
@@ -205,42 +205,46 @@ android {
205205
}
206206

207207
lint {
208-
disable 'InvalidPackage'
209-
disable "Instantiatable"
208+
disable.add('InvalidPackage')
209+
disable.add("Instantiatable")
210210
checkReleaseBuilds false
211211
abortOnError false
212-
htmlReport true
213212
warningsAsErrors false
214213
baseline file("$rootDir/config/lint/baseline.xml")
215214
checkAllWarnings true
216215
htmlReport true
217216
xmlReport true
218217
}
218+
219219
namespace 'com.github.jameshnsears.quoteunquote'
220220
}
221221

222222
dependencies {
223223
androidTestImplementation 'androidx.arch.core:core-testing:2.2.0'
224-
androidTestImplementation 'androidx.compose.ui:ui-test-junit4-android:1.8.1'
225-
androidTestImplementation 'androidx.room:room-testing:2.7.1'
224+
androidTestImplementation 'androidx.compose.ui:ui-test-junit4-android:1.8.3'
225+
androidTestImplementation 'androidx.room:room-testing:2.7.2'
226226
androidTestImplementation 'androidx.test:core:1.6.1'
227227
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
228228
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
229229
androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
230230
androidTestImplementation 'androidx.test:rules:1.6.1'
231231
androidTestImplementation 'androidx.test:runner:1.6.2'
232232
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
233+
234+
// stay on 1.14.2 or else jacoco / bytebuddy clash
235+
//noinspection GradleDependency
233236
androidTestImplementation 'io.mockk:mockk-android:1.14.2'
237+
234238
androidTestImplementation 'org.jetbrains.kotlin:kotlin-test-junit:2.1.21'
235-
annotationProcessor 'androidx.room:room-compiler:2.7.1'
239+
annotationProcessor 'androidx.room:room-compiler:2.7.2'
236240
debugImplementation 'androidx.compose.ui:ui-tooling-preview'
237-
debugImplementation 'androidx.fragment:fragment-testing:1.8.6'
241+
debugImplementation 'androidx.fragment:fragment-testing:1.8.8'
238242
debugImplementation 'androidx.test:core-ktx:1.6.1'
239243
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
240-
googleplayImplementation platform('com.google.firebase:firebase-bom:33.13.0')
244+
googleplayImplementation platform('com.google.firebase:firebase-bom:33.15.0')
241245
implementation 'androidx.activity:activity-compose:1.10.1'
242246
implementation 'androidx.activity:activity-ktx:1.10.1'
243-
implementation 'androidx.appcompat:appcompat:1.7.0'
247+
implementation 'androidx.appcompat:appcompat:1.7.1'
244248
implementation 'androidx.cardview:cardview:1.0.0'
245249
implementation 'androidx.compose.material3:material3'
246250
implementation 'androidx.compose.material:material'
@@ -249,14 +253,14 @@ dependencies {
249253
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
250254
implementation 'androidx.core:core-ktx:1.16.0'
251255
implementation 'androidx.core:core-ktx:1.16.0'
252-
implementation 'androidx.databinding:databinding-runtime:8.10.0'
256+
implementation 'androidx.databinding:databinding-runtime:8.10.1'
253257
implementation 'androidx.lifecycle:lifecycle-runtime-ktx'
254258
implementation 'androidx.multidex:multidex:2.0.1'
255-
implementation 'androidx.room:room-guava:2.7.1'
256-
implementation 'androidx.room:room-runtime:2.7.1'
257-
implementation 'androidx.room:room-rxjava2:2.7.1'
258-
implementation 'androidx.work:work-runtime:2.10.1'
259-
implementation 'androidx.work:work-runtime-ktx:2.10.1'
259+
implementation 'androidx.room:room-guava:2.7.2'
260+
implementation 'androidx.room:room-runtime:2.7.2'
261+
implementation 'androidx.room:room-rxjava2:2.7.2'
262+
implementation 'androidx.work:work-runtime:2.10.2'
263+
implementation 'androidx.work:work-runtime-ktx:2.10.2'
260264
implementation 'com.github.skydoves:colorpickerpreference:2.0.6'
261265
implementation 'com.google.android.material:material:1.12.0'
262266
implementation 'com.google.code.gson:gson:2.13.1'
@@ -275,20 +279,20 @@ dependencies {
275279
implementation 'org.apache.commons:commons-csv:1.12.0'
276280

277281
implementation 'org.jsoup:jsoup:1.20.1'
278-
implementation platform('androidx.compose:compose-bom:2025.05.00')
282+
implementation platform('androidx.compose:compose-bom:2025.06.01')
279283
implementation project(path: ':cloudLib')
280284
implementation project(path: ':utilsLib')
281285
testImplementation 'androidx.arch.core:core-testing:2.2.0'
282-
testImplementation 'androidx.room:room-testing:2.7.1'
286+
testImplementation 'androidx.room:room-testing:2.7.2'
283287
testImplementation 'androidx.test:core-ktx:1.6.1'
284288
testImplementation 'androidx.test.ext:junit:1.2.1'
285289
testImplementation 'androidx.test:rules:1.6.1'
286290
testImplementation 'ch.qos.logback:logback-classic:1.5.18'
287291
testImplementation 'com.google.guava:guava:33.4.8-jre'
288-
testImplementation 'io.mockk:mockk:1.14.2'
292+
testImplementation 'io.mockk:mockk:1.14.3'
289293
testImplementation 'junit:junit:4.13.2'
290294
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
291-
testImplementation 'org.robolectric:robolectric:4.14.1'
295+
testImplementation 'org.robolectric:robolectric:4.15.1'
292296
}
293297

294298
repositories {

app/schemas/com.github.jameshnsears.quoteunquote.database.quotation.AbstractQuotationDatabase/51.json renamed to app/schemas/com.github.jameshnsears.quoteunquote.database.quotation.AbstractQuotationDatabase/52.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"formatVersion": 1,
33
"database": {
4-
"version": 51,
4+
"version": 52,
55
"identityHash": "4576f076a1896260b13b26d1a0d40a61",
66
"entities": [
77
{

app/src/androidTest/kotlin/com/github/jameshnsears/quoteunquote/cloud/transfer/backup/TransferBackupSettingsTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ class TransferBackupSettingsTest : GsonTestHelper() {
129129
true,
130130
true,
131131
false,
132+
0,
132133
)
133134

134135
private fun expectedQuotations() = Quotations(

app/src/androidTest/kotlin/com/github/jameshnsears/quoteunquote/configure/fragment/quotations/tabs/content/files/csv/FilesCsvInPlaceEditDialogTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class FilesCsvInPlaceEditDialogTest : QuoteUnquoteModelUtility() {
3737
)
3838

3939
scenario.onFragment { contentCsvInPlaceEditDialog ->
40-
assertTrue(contentCsvInPlaceEditDialog.quoteUnquoteModel.allQuotations.size == 19927)
40+
assertTrue(contentCsvInPlaceEditDialog.quoteUnquoteModel.allQuotations.size == 19903)
4141
}
4242

4343
composeRule.onNodeWithText("Save").assertExists().performClick()
-4 KB
Binary file not shown.

0 commit comments

Comments
 (0)