Skip to content

Commit 72ea1f0

Browse files
committed
Merge branch 'release/1.3.6'
2 parents 3c298d9 + 5f65f47 commit 72ea1f0

File tree

10 files changed

+24052
-18097
lines changed

10 files changed

+24052
-18097
lines changed

app/dependencies/fossReliantReleaseRuntimeClasspath.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ com.google.guava:failureaccess:1.0.1
150150
com.google.guava:guava:31.0.1-jre
151151
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
152152
com.google.j2objc:j2objc-annotations:1.3
153-
com.google.protobuf:protobuf-javalite:4.29.0
154-
com.google.protobuf:protobuf-kotlin-lite:4.29.0
153+
com.google.protobuf:protobuf-javalite:4.26.0
154+
com.google.protobuf:protobuf-kotlin-lite:4.26.0
155155
com.jakewharton.timber:timber:5.0.1
156156
com.squareup.okhttp3:okhttp:4.12.0
157157
com.squareup.okio:okio-jvm:3.9.0

app/dependencies/googlePlayReleaseRuntimeClasspath.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
244244
com.google.mlkit:common:18.8.0
245245
com.google.mlkit:vision-common:17.3.0
246246
com.google.mlkit:vision-interfaces:16.2.0
247-
com.google.protobuf:protobuf-javalite:4.29.0
248-
com.google.protobuf:protobuf-kotlin-lite:4.29.0
247+
com.google.protobuf:protobuf-javalite:4.26.0
248+
com.google.protobuf:protobuf-kotlin-lite:4.26.0
249249
com.jakewharton.timber:timber:5.0.1
250250
com.squareup.okhttp3:okhttp:4.12.0
251251
com.squareup.okio:okio-jvm:3.9.0

app/fossReliantRelease-badging.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package: name='com.mshdabiola.playnotepad.foss' versionCode='135' versionName='1.3.5' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
1+
package: name='com.mshdabiola.playnotepad.foss' versionCode='136' versionName='1.3.6' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
22
sdkVersion:'24'
33
targetSdkVersion:'35'
44
uses-permission: name='android.permission.RECORD_AUDIO'

app/src/fossReliantRelease/generated/baselineProfiles/baseline-prof.txt

Lines changed: 7044 additions & 7361 deletions
Large diffs are not rendered by default.

app/src/fossReliantRelease/generated/baselineProfiles/startup-prof.txt

Lines changed: 1246 additions & 1242 deletions
Large diffs are not rendered by default.

app/src/googlePlayRelease/generated/baselineProfiles/baseline-prof.txt

Lines changed: 7929 additions & 4747 deletions
Large diffs are not rendered by default.

app/src/googlePlayRelease/generated/baselineProfiles/startup-prof.txt

Lines changed: 7816 additions & 4729 deletions
Large diffs are not rendered by default.

benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/detail/DetailActions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.test.uiautomator.Until
1111
fun MacrobenchmarkScope.goBack() {
1212
val selector = By.res("detail:back")
1313

14-
device.wait(Until.hasObject(selector), 5000)
14+
device.wait(Until.hasObject(selector), 10000)
1515

1616
val backButton = device.findObject(selector)
1717
try {
@@ -28,7 +28,7 @@ fun MacrobenchmarkScope.addNote() {
2828
val titleSelector = By.res("detail:title")
2929
val contentSelector = By.res("detail:content")
3030

31-
device.wait(Until.hasObject(titleSelector), 5000)
31+
device.wait(Until.hasObject(titleSelector), 10000)
3232

3333
val titleTextField = device.findObject(titleSelector)
3434
val contentTextField = device.findObject(contentSelector)

benchmarks/src/main/kotlin/com/mshdabiola/benchmarks/main/MainActions.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ package com.mshdabiola.benchmarks.main
77
import androidx.benchmark.macro.MacrobenchmarkScope
88
import androidx.test.uiautomator.By
99
import androidx.test.uiautomator.Until
10-
import com.mshdabiola.benchmarks.flingElementDownUp
1110

1211
fun MacrobenchmarkScope.goToDetailScreen() {
1312
val savedSelector = By.res("main:add")
1413

15-
device.wait(Until.hasObject(savedSelector), 5000)
14+
device.wait(Until.hasObject(savedSelector), 10000)
1615

1716
val addButton = device.findObject(savedSelector)
1817
addButton.click()
@@ -21,11 +20,11 @@ fun MacrobenchmarkScope.goToDetailScreen() {
2120
}
2221

2322
fun MacrobenchmarkScope.mainScrollNoteDownUp() {
24-
val selector = By.res("main:list")
25-
device.wait(Until.hasObject(selector), 5000)
26-
27-
val feedList = device.findObject(selector)
28-
device.flingElementDownUp(feedList)
23+
// val selector = By.res("main:list")
24+
// device.wait(Until.hasObject(selector), 10000)
25+
//
26+
// val feedList = device.findObject(selector)
27+
// device.flingElementDownUp(feedList)
2928
}
3029

3130
fun MacrobenchmarkScope.mainWaitForContent() {

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ androidxWork = "2.10.0"
3333
coil = "2.7.0"
3434
dependencyGuard = "0.5.0"
3535
firebaseBom = "33.7.0"
36-
firebaseCrashlyticsPlugin = "2.9.9"
36+
firebaseCrashlyticsPlugin = "3.0.2"
3737
firebasePerfPlugin = "1.4.2"
3838
gmsPlugin = "4.4.2"
3939
googleOss = "17.1.0"
@@ -45,7 +45,7 @@ kotlin = "2.1.0"
4545
kotlinxCoroutines = "1.9.0"
4646
kotlinxDatetime = "0.6.1"
4747
kotlinxSerializationJson = "1.7.3"
48-
protobuf = "4.29.0"
48+
protobuf = "4.26.0"
4949
protobufPlugin = "0.9.4"
5050
ksp = "2.1.0-1.0.29"
5151
moduleGraph = "2.7.1"
@@ -92,8 +92,8 @@ kover = "0.9.0"
9292
series = "0.0.19"
9393
calf = "0.4.0"
9494

95-
versionName = "1.3.5"
96-
versionCode = "135"
95+
versionName = "1.3.6"
96+
versionCode = "136"
9797

9898
telephoto = "0.13.0"
9999
lottieCompose = "6.5.0"

0 commit comments

Comments
 (0)